rhino_project_core 0.20.0.alpha.0 → 0.20.0.beta.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f2e6d0cf9a761ebe9b75b3cacf2b6345a2b91df4d9d3f456a9108492aac0988
-  data.tar.gz: 45365e2f7d1efe25bbfc153a497804758a43bc160c2d13a22918af94390d0790
+  metadata.gz: f8779f64179f5c2a26ea37d704c7ac7355f713fc2f386aa6ab08e3e7a0ff174f
+  data.tar.gz: 2e6139b4b62758822ab9db651b9468af7726e0a56d0a34c1d5712b418e21db70
 SHA512:
-  metadata.gz: bdb873a1c1e4717d74dc52dda547b573a921e730023fa6ea307a2df0b776fd579832aba12da869d1c33e2edc2d2a39f7a5bc33a501e177ccb7cf0db71c7d6908
-  data.tar.gz: 7375ef91e536a7a77b1a39e85ee5c501b035b6bd4127ad824064424ef78ae64b6114600dd88c6eade02ce7350fa1a3ffe5787a80ac07db4e625cf823c90c5444
+  metadata.gz: 877bcedc2608beaa6d9d667991858d1b3c272ff876380e1ec1c34e07504cfbc79b153f686aafecc47b8f233d7939c8310012ec99c9f160ff30bc36543d079efb
+  data.tar.gz: 3a63eab50a46bbfc236d1cc8d4e0f123bf908ae2a94fbaaf2e251c00817daff159c4acc0a4400730e7cb2df0c39b347595cbac6f810e7aa81c74bfa228d74a56

data/Rakefile

@@ -25,11 +25,10 @@ require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"].exclude("test/system/**/*", "test/dummy/**/*")
-  t.verbose = true
-  t.warning = false
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
 task default: :test

data/app/controllers/concerns/rhino/error_handling.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "active_record/associations"
-
 module Rhino
   module ErrorHandling
     extend ActiveSupport::Concern

data/app/controllers/rhino/simple_controller.rb

@@ -5,9 +5,7 @@ module Rhino
     def action_missing(action)
       authorize klass, "#{action}?".to_sym
 
-      method = klass.method(action)
-
-      render json: method.parameters.any? ? klass.send(action, params) : klass.send(action)
+      render json: klass.send(action)
     end
   end
 end

data/app/overrides/devise_token_auth/omniauth_callbacks_controller_override.rb

@@ -3,7 +3,7 @@
 # https://stackoverflow.com/questions/4470108/when-monkey-patching-an-instance-method-can-you-call-the-overridden-method-from/4471202
 # Mixin Prepending
 module DeviseTokenAuth::OmniauthCallbacksController::Extensions
-  include RhinoOrganizations::Concerns::CreateOrganization if Rhino.resources.include?("Organization")
+  include RhinoOrganizations::Concerns::CreateOrganization
 
   def redirect_callbacks
     # derive target redirect route from 'resource_class' param, which was set
@@ -30,7 +30,7 @@ module DeviseTokenAuth::OmniauthCallbacksController::Extensions
 
     # set a server cookie if configured
     if DeviseTokenAuth.cookie_enabled
-      auth_header = @resource.build_auth_headers(@token.token, @token.client)
+      auth_header = @resource.build_auth_header(@token.token, @token.client)
       cookies[DeviseTokenAuth.cookie_name] = DeviseTokenAuth.cookie_attributes.merge(value: auth_header.to_json)
     end
   rescue ActiveRecord::RecordInvalid

data/app/overrides/devise_token_auth/registrations_controller_override.rb

@@ -3,7 +3,7 @@
 # https://stackoverflow.com/questions/4470108/when-monkey-patching-an-instance-method-can-you-call-the-overridden-method-from/4471202
 # Mixin Prepending
 module DeviseTokenAuth::RegistrationsController::Extensions
-  include RhinoOrganizations::Concerns::CreateOrganization if Rhino.resources.include?("Organization")
+  include RhinoOrganizations::Concerns::CreateOrganization
 
   def create
     return render_error(401, "signup is not allowed") unless Rhino.allow_signup

data/lib/commands/rhino_command.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "dotenv"
+require "rails/command"
+
+module Rails
+  module Command
+    class RhinoCommand < Base # :nodoc:
+      include Thor::Actions
+
+      no_commands do
+        def help
+          say "rails rhino::dummy [module] command # Run rails command in dummy application, defaults to rhino"
+        end
+      end
+
+      def dummy(*args)
+        rhino_command("test/dummy", nil, *args)
+      end
+
+      def test(*args)
+        rhino_command(nil, "test", *args)
+      end
+
+      def rails(*args)
+        rhino_command(nil, nil, *args)
+      end
+
+      def coverage(*args)
+        ENV["COVERAGE"] = "1"
+        test(*args)
+      end
+
+      protected
+        def rhino_command(extra_path, base_command, *args) # rubocop:todo Metrics/MethodLength
+          # Default to just rhino/rhino if no obvious module
+          module_name = if Dir.exist?("rhino/rhino_#{args[0]}")
+            args.shift
+          else
+            nil
+          end
+          module_base = ["rhino", module_name].compact.join("_")
+          module_path = ["rhino/#{module_base}", extra_path].compact.join("/")
+          db_name = "#{module_base}_dummy"
+
+          # Getting existing variables and re-use
+          ::Dotenv.load
+
+          inside(module_path) do
+            # Override DB_NAME so multiple can run in parallel
+            run(
+              "DB_NAME=#{db_name} BUNDLE_GEMFILE='#{__dir__}/../../../../Gemfile' bin/rails #{base_command} #{args.join(' ')}",
+              { abort_on_failure: true }
+            )
+          end
+        end
+    end
+  end
+end

data/lib/generators/rhino/dev/setup/setup_generator.rb

@@ -5,21 +5,16 @@ module Rhino
     module Dev
       # rubocop:disable Metrics/ClassLength
       class SetupGenerator < ::Rails::Generators::Base
-        DEFAULT_SERVER_PORT = 3000
-        DEFAULT_CLIENT_PORT = DEFAULT_SERVER_PORT + 1
-
-        class_option :prompt, type: :boolean, default: true, desc: "Prompt user for configuration options"
-        class_option :defaults, type: :string, enum: %w[local docker], default: "local", desc: "Use configuration defaults of type DEFAULTS"
-        class_option :skip_existing, type: :boolean, default: false, desc: "Skip existing env files"
-        class_option :server_port, type: :numeric, default: DEFAULT_SERVER_PORT, group: :server, desc: "Server port"
-        class_option :client_port, type: :numeric, default: DEFAULT_CLIENT_PORT, group: :client, desc: "Client port"
-        class_option :db_host, type: :string, group: :database
-        class_option :db_name, type: :string, group: :database
-        class_option :db_port, type: :numeric, default: 5432, group: :database
-        class_option :db_user, type: :string, group: :database
-        class_option :db_password, type: :string, group: :database
-        class_option :redis_port, type: :numeric, default: 6379, group: :redis
-        class_option :redis_database, type: :numeric, default: 0, group: :redis
+        class_option :prompt, type: :boolean, default: true
+        class_option :server_port, type: :numeric
+        class_option :client_port, type: :numeric
+        class_option :db_host, type: :string
+        class_option :db_name, type: :string
+        class_option :db_port, type: :numeric
+        class_option :db_user, type: :string
+        class_option :db_password, type: :string
+        class_option :redis_port, type: :numeric
+        class_option :redis_database, type: :numeric
 
         attr_reader :server_port,
                     :client_port,
@@ -35,19 +30,11 @@ module Rhino
 
         source_root File.expand_path("templates", __dir__)
 
-        def check_existing
-          return unless options[:skip_existing] && File.exist?(server_file(".env"))
-
-          say "Skipping existing .env files"
-          exit(0)
-        end
-
         def setup_env
           say "Setting up local .env files"
 
           collect_env_info
 
-          template "env.root", project_file(".env")
           template "env.server", server_file(".env")
           template "env.client", client_file(".env")
         end
@@ -71,19 +58,17 @@ module Rhino
           end
 
           def server_port_default
-            options[:server_port] || ENV["PORT"]
+            options[:server_port] || ENV["PORT"] || 3000
           end
 
           def client_port_default
             @server_port.to_i + 1
           end
 
-          def project_name
-            @project_name ||= File.basename(project_dir).sub(/[-_]?mono/, "")
-          end
-
           def db_name_default
-            db_name = options[:db_name] || ENV["DB_NAME"] || project_name
+            db_name =
+              options[:db_name] || ENV["DB_NAME"] ||
+              File.basename(project_dir).sub(/[-_]?mono/, "")
 
             return db_name if db_name.present?
 
@@ -95,15 +80,15 @@ module Rhino
           end
 
           def db_port_default
-            options[:db_port] || ENV["DB_PORT"]
+            options[:db_port] || ENV["DB_PORT"] || 5432
           end
 
           def db_user_default
-            options[:db_user] || ENV["DB_USERNAME"] || `whoami`
+            options[:db_user] || ENV["DB_USERNAME"] || (dockerized ? "postgres" : "")
           end
 
           def db_password_default
-            options[:db_password] || ENV["DB_PASSWORD"] || ""
+            options[:db_password] || ENV["DB_PASSWORD"] || (dockerized ? "password" : "")
           end
 
           def redis_host_default
@@ -111,15 +96,15 @@ module Rhino
           end
 
           def redis_port_default
-            options[:redis_port] || ENV["REDIS_PORT"]
+            options[:redis_port] || ENV["REDIS_PORT"] || 6379
           end
 
           def redis_database_default
-            options[:redis_database] || ENV["REDIS_DATABASE"]
+            options[:redis_database] || ENV["REDIS_DATABASE"] || 0
           end
 
           def dockerized_default
-            options[:defaults] == "docker" ? "Y" : "N"
+            "yN"
           end
 
           def collect_env_info
@@ -133,46 +118,37 @@ module Rhino
           end
 
           def collect_docker_info
-            @dockerized = %w[y Y].include?(ask_prompt("Run with docker?", dockerized_default))
+            @dockerized = %w[y Y].include?(ask_prompt("Run server on docker?", dockerized_default))
 
             return unless dockerized
 
             @db_host = "db"
-            @db_user = "postgres"
-            @db_password = "password"
-            @db_port = 5432
             @redis_host = "redis"
             @redis_port = 6379
-            @redis_database = 0
 
             puts <<~HERE
               The following docker configuration has been automatically set for you:
               Database host: #{db_host}
-              Database port: #{db_port}
-              Database user: #{db_user}
-              Database password: #{db_password}
               Redis host: #{redis_host}
               Redis port: #{redis_port}
-              Redis database: #{redis_database}
             HERE
           end
 
-          def collect_database_info
+          def collect_database_info # rubocop:todo Metrics/AbcSize
             @db_name = ask_prompt("Database?", db_name_default)
-            @db_host ||= ask_prompt("Database host?", db_host_default)
-            @db_port ||= ask_prompt("Database port?", db_port_default)
-            @db_user ||= ask_prompt("Database User?", db_user_default)
-            @db_password ||= ask_prompt("Database Password?", db_password_default)
-
-            nil
+            @db_host = ask_prompt("Database host?", db_host_default) unless dockerized
+            @db_port = ask_prompt("Database port?", db_port_default)
+            @db_user = ask_prompt("Database User?", db_user_default) until !dockerized || db_user.present?
+            @db_password = ask_prompt("Database Password?", db_password_default) until !dockerized || db_password.present?
           end
 
           def collect_redis_info
-            @redis_host ||= ask_prompt("Redis host?", redis_host_default)
-            @redis_port ||= ask_prompt("Redis port?", redis_port_default)
-            @redis_database ||= ask_prompt("Redis database?", redis_database_default)
+            unless dockerized
+              @redis_host = ask_prompt("Redis host?", redis_host_default)
+              @redis_port = ask_prompt("Redis port?", redis_port_default)
+            end
 
-            nil
+            @redis_database = ask_prompt("Redis database?", redis_database_default)
           end
 
           def project_file(file)

data/lib/generators/rhino/module/module_generator.rb

@@ -1,90 +1,91 @@
 # frozen_string_literal: true
 
-require "rails/generators"
-require "rails/generators/rails/plugin/plugin_generator"
-require "rhino/version"
-
 module Rhino
   module Generators
-    class ModuleBuilder < ::Rails::PluginBuilder
-      def lib
-        template "lib/%namespaced_name%.rb"
-        template "lib/%namespaced_name%/version.rb"
+    class ModuleGenerator < ::Rails::Generators::Base
+      attr_reader :module_name, :module_path
 
-        template "lib/%namespaced_name%/engine.rb"
+      class_option :full, type: :boolean, default: false,
+                          desc: 'Full plugin generation'
 
-        # The install generator
-        empty_directory_with_keep_file "lib/generators/#{namespaced_name}/install/templates"
-        template "lib/generators/%namespaced_name%/install/install_generator.rb"
-        template "lib/tasks/%namespaced_name%_tasks.rake"
-      end
+      class_option :skip_plugin, type: :boolean, default: false,
+                                 desc: 'Skip plugin generation'
 
-      # FIXME: Hack because the engine.rb file is over aggressive in its checks
-      def rhino_hack
-        template "test/dummy/config/initializers/devise.rb"
-        template "test/dummy/config/initializers/devise_token_auth.rb"
-        template "test/dummy/app/models/user.rb"
-        remove_file "test/dummy/config/database.yml"
-        template "test/dummy/config/database.yml"
-      end
-    end
+      source_root File.expand_path('templates', __dir__)
+
+      def create_module
+        @module_name = ask('Module name?')
+        @module_name = "rhino_#{module_name}" unless module_name.starts_with?('rhino_')
+        @module_path = "rhino/#{module_name}"
 
-    class ModuleGenerator < ::Rails::Generators::PluginGenerator
-      source_root File.expand_path("templates", __dir__)
+        return if options[:skip_plugin]
 
-      class_option :database, type: :string, aliases: "-d", default: "postgresql", hide: true
-      class_option :full, type: :boolean, default: true, hide: true
-      remove_class_option :template
+        say "Creating #{module_name}"
 
-      def self.banner
-        "rails rhino:module #{arguments.map(&:usage).join(' ')} [options]"
+        plugin_command = "plugin new #{module_path} --skip-git"
+        plugin_command = "#{plugin_command} --full" if options[:full]
+        rails_command(plugin_command)
       end
 
-      # Parent source paths
-      def source_paths
-        [
-          File.expand_path("templates", __dir__),
-          Rails::Generators::PluginGenerator.source_root
-        ]
+      def remove_license
+        remove_file "#{module_path}/MIT-LICENSE"
       end
 
-      # Has to be named this way as it overrides the default
-      def get_builder_class # rubocop:disable Naming/AccessorMethodName
-        ModuleBuilder
+      def engine_registration
+        engine_file = "#{module_path}/lib/#{module_name}/engine.rb"
+
+        remove_file engine_file
+        template 'engine.rb', engine_file
       end
 
-      def engine_config
-        content = []
+      def create_install_generator
+        generator_path = "#{module_path}/lib/generators/#{module_name}/install"
+        tasks_path = "#{module_path}/lib/tasks"
 
-        content << "isolate_namespace #{camelized_modules}\n" if mountable?
-        content << "config.generators.api_only = true" if api?
+        empty_directory "#{generator_path}/templates"
+        create_file("#{generator_path}/templates/.keep")
 
-        return optimize_indentation(content.join("\n"), 4) if content.any?
+        template 'install_generator.rb', "#{generator_path}/install_generator.rb"
+        template 'module_tasks.rake', "#{tasks_path}/#{module_name}.rake"
 
-        nil
+        remove_file "#{tasks_path}/#{module_name}_tasks.rake"
       end
 
-      def rhino_version
-        ::Rhino::VERSION::STRING
+      def fix_gemspec
+        gemspec_file = "#{module_path}/#{module_name}.gemspec"
+
+        gsub_file gemspec_file, /spec.homepage.*/, 'spec.homepage    = ""'
+        gsub_file gemspec_file, /spec.summary.*/, 'spec.summary     = ""'
+        gsub_file gemspec_file, /spec.description.*/, 'spec.description = ""'
+        gsub_file gemspec_file, /spec.license.*/, 'spec.license      = ""'
+        gsub_file gemspec_file, 'spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]', 'spec.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]' # rubocop:disable Layout/LineLength
       end
 
-      def rhino_setup
-        return unless with_dummy_app?
+      # Gross hack for now
+      DUMMY_SETUP_FILES = [
+        'config/database.yml',
+        'config/initializers/devise_token_auth.rb',
+        'config/initializers/devise.rb',
+        'app/models/user.rb',
+        'db/migrate/20210111014230_devise_token_auth_create_users.rhino_engine.rb'
+      ].freeze
+
+      def dummy_setup
+        return unless options[:full]
 
-        build(:rhino_hack)
+        rhino_dummy = Rails.root.join('rhino/rhino/test/dummy')
+        module_dummy = Rails.root.join("#{module_path}/test/dummy")
 
-        inside(rails_app_path) do
-          run "rails rhino:module:dummy #{namespaced_name} rhino:install"
-          run "rails rhino:module:dummy #{namespaced_name} db:create"
-          run "rails rhino:module:dummy #{namespaced_name} db:migrate"
+        remove_file "#{module_dummy}/config/database.yml"
+
+        DUMMY_SETUP_FILES.each do |file|
+          copy_file "#{rhino_dummy}/#{file}", "#{module_dummy}/#{file}"
         end
       end
 
       def rubocop
-        template ".rubocop.yml"
-
-        inside(File.join(rails_app_path, namespaced_name)) do
-          run "bundle exec rubocop -A ", capture: true
+        inside(module_path) do
+          run 'bundle exec rubocop -a', capture: true
         end
       end
     end

data/lib/generators/rhino/module/templates/engine.rb.tt

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "rhino/engine"
+
+module <%= module_name.camelize %>
+  class Engine < ::Rails::Engine
+    config.autoload_paths << File.expand_path("../../lib", __dir__)
+
+    initializer "<%= module_name %>.register_module" do
+      config.after_initialize do
+        if true
+          Rhino.registered_modules[:<%= module_name %>] = {
+            version: <%= module_name.camelize %>::VERSION
+          }
+        end
+      end
+    end
+  end
+end

data/lib/generators/rhino/module/templates/{lib/generators/%namespaced_name%/install/install_generator.rb.tt → install_generator.rb.tt}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module <%= camelized_modules %>
+module <%= module_name.camelize %>
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path("templates", __dir__)

data/lib/generators/rhino/module/templates/module_tasks.rake.tt

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+namespace :<%= module_name %> do
+  # Prevent migration installation task from showing up twice.
+  if Rake::Task.task_defined?("<%= module_name %>_engine:install:migrations")
+    Rake::Task["<%= module_name %>_engine:install:migrations"].clear_comments
+  end
+
+  desc "Install <%= module_name %>"
+  task install: :environment do
+    if Rake::Task.task_defined?("<%= module_name %>_engine:install:migrations")
+      Rake::Task["<%= module_name %>_engine:install:migrations"].invoke
+    end
+
+    Rails::Command.invoke :generate, ["<%= module_name %>:install"]
+  end
+end

data/lib/rhino/engine.rb

@@ -1,31 +1,5 @@
 # frozen_string_literal: true
 
-require "rhino/version"
-
-# https://guides.rubyonrails.org/engines.html#other-gem-dependencies
-require "activeadmin"
-require "acts-as-taggable-on"
-require "ancestry"
-require "arel-helpers"
-require "countries"
-require "devise"
-require "devise_invitable"
-require "devise_token_auth"
-require "friendly_id"
-require "geocoder"
-require "omniauth"
-require "omniauth-azure-activedirectory-v2"
-require "omniauth-auth0"
-require "omniauth-facebook"
-require "omniauth-github"
-require "omniauth-google-oauth2"
-require "omniauth/rails_csrf_protection"
-require "rack/cors"
-require "pg_search"
-require "phonelib"
-require "pundit"
-require "segment/analytics"
-
 module Rhino
   class Engine < ::Rails::Engine
     config.before_configuration do
@@ -37,19 +11,19 @@ module Rhino
       end
     end
 
-    initializer "rhino.active_record_extension" do
+    initializer 'rhino.active_record_extension' do
       ActiveSupport.on_load(:active_record) do
-        require_relative "resource/active_record_extension"
-        require_relative "resource/active_record_tree"
-        require_relative "resource/active_model_extension"
+        require_relative 'resource/active_record_extension'
+        require_relative 'resource/active_record_tree'
+        require_relative 'resource/active_model_extension'
 
         include Rhino::Resource::ActiveRecordExtension if Rhino.auto_include_active_record
       end
     end
 
-    initializer "rhino.active_storage_extension" do
+    initializer 'rhino.active_storage_extension' do
       ActiveSupport.on_load(:active_storage_attachment) do
-        require_relative "resource/active_storage_extension"
+        require_relative 'resource/active_storage_extension'
 
         include Rhino::Resource::ActiveStorageExtension
       end
@@ -57,7 +31,7 @@ module Rhino
 
     # https://guides.rubyonrails.org/engines.html#overriding-models-and-controllers
     # Use root instead of Rails.root to scope for this engine
-    initializer "rhino.overrides" do
+    initializer 'rhino.overrides' do
       overrides = "#{root}/app/overrides"
       Rails.autoloaders.main.ignore(overrides)
 
@@ -68,13 +42,13 @@ module Rhino
       end
     end
 
-    initializer "rhino.check_resources" do
+    initializer 'rhino.check_resources' do
       config.after_initialize do
         check_resources
       end
     end
 
-    initializer "rhino.resource_reloader" do
+    initializer 'rhino.resource_reloader' do
       config.after_initialize do
         Rails.application.reloader.to_prepare do
           Rhino.resource_classes = nil
@@ -82,12 +56,12 @@ module Rhino
       end
     end
 
-    initializer "rhino.register_module" do
-      require "rhino/omniauth/strategies/azure_o_auth2"
+    initializer 'rhino.register_module' do
+      require 'rhino/omniauth/strategies/azure_o_auth2'
 
       config.after_initialize do
         Rhino.registered_modules[:rhino] = {
-          version: Rhino::VERSION::STRING,
+          version: Rhino::VERSION,
           authOwner: Rhino.auth_owner.model_name.singular,
           baseOwner: Rhino.base_owner.model_name.singular,
           oauth: Rhino::OmniauthHelper.strategies_metadata,
@@ -156,11 +130,11 @@ module Rhino
     end
 
     def self.run_from_dev_setup?
-      defined?(Rake.application) && Rake.application.top_level_tasks == ["rhino:dev:setup"]
+      Rake.application.top_level_tasks == ["rhino:dev:setup"]
     end
 
     def self.run_from_package?
-      defined?(Rake.application) && Rake.application.top_level_tasks == ["package"]
+      Rake.application.top_level_tasks == ["package"]
     end
   end
 end

data/lib/rhino/resource/active_model_extension/properties.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "js_regex"
-
 module Rhino
   module Resource
     module ActiveModelExtension

data/lib/rhino/resource/active_record_extension/properties.rb

@@ -44,7 +44,7 @@ module Rhino
             end
 
             def virtual_properties
-              columns.select(&:virtual?).map(&:name) # rubocop:todo Performance/SelectMap
+              columns.select(&:virtual?).map(&:name)
             end
 
             def foreign_key_properties

data/lib/rhino/resource/active_record_extension/properties_describe.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "js_regex"
-
 module Rhino
   module Resource
     module ActiveRecordExtension