bullet_train-super_scaffolding 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70ece838f74f54649206711a4b47490b7b964a0f46a88b011f825991394b2b62
-  data.tar.gz: 340950b5e4178927adcb07af2a8c66c4cafefb12f6d19d4c2c325553ec2dfe50
+  metadata.gz: c51b54399bb608b01931f86efd965719fe7bd4231107a903c72d06411fb9f6b3
+  data.tar.gz: 977733e8384c06ce13676a41f273783f9b8d1e90ad3ded2b82c6d7c533bf4225
 SHA512:
-  metadata.gz: e8cb9655bb6ec31eda2d3f3a4b8cd06a888e40b840ac4f49757f980b645188dbf8f29f5e8f7e748fa64eaf55cc3b89af94ba5ff75407eb5b52628f461c9b0fa8
-  data.tar.gz: 6f7cc7408eacecdcb81038d582fafec8b8085ce42929ce21c5976f53cff277d3506754f16c9a13eddc41f76b45bb7f2daa9f82c3a10ee4b0568ba5ca9213ce2b
+  metadata.gz: '063490810ef08ba8cbd454ffde388101538973e76c1fabbe80f1bc2362b73009485114a684ac373a9e0e0bc75eda107623959cd74f2742adace07fdea165168f'
+  data.tar.gz: 70713bf20a0addeb635a89b0dd7c45f80c39faf9c8d80f9d20046f39cb0781529ac74ac7258e83e0d67c5a8712c722733de8ac3e0fd3a30b280a8ba237380115

data/lib/bullet_train/super_scaffolding/scaffolders/oauth_provider_scaffolder.rb

@@ -78,7 +78,9 @@ module BulletTrain
 
             # User OAuth.
             "./app/models/oauth/stripe_account.rb",
+            "./app/models/concerns/oauth/stripe_accounts/base.rb",
             "./app/models/webhooks/incoming/oauth/stripe_account_webhook.rb",
+            "./app/models/concerns/webhooks/incoming/oauth/stripe_account_webhooks/base.rb",
             "./app/controllers/account/oauth/stripe_accounts_controller.rb",
             "./app/controllers/webhooks/incoming/oauth/stripe_account_webhooks_controller.rb",
             "./app/views/account/oauth/stripe_accounts",
@@ -89,6 +91,7 @@ module BulletTrain
 
             # Team Integration.
             "./app/models/integrations/stripe_installation.rb",
+            "./app/models/concerns/integrations/stripe_installations/base.rb",
             # './app/serializers/api/v1/integrations/stripe_installation_serializer.rb',
             "./app/controllers/account/integrations/stripe_installations_controller.rb",
             "./app/views/account/integrations/stripe_installations",
@@ -101,7 +104,7 @@ module BulletTrain
             "./app/controllers/webhooks/incoming/oauth/stripe_account_webhooks_controller.rb"
 
           ].each do |name|
-            if File.directory?(name)
+            if File.directory?(legacy_resolve_template_path(name))
               oauth_scaffold_directory(name, options)
             else
               oauth_scaffold_file(name, options)
@@ -109,7 +112,7 @@ module BulletTrain
           end
 
           oauth_scaffold_add_line_to_file("./app/views/devise/shared/_oauth.html.erb", "<%= render 'devise/shared/oauth/stripe', verb: verb if stripe_enabled? %>", "<%# 🚅 super scaffolding will insert new oauth providers above this line. %>", options, prepend: true)
-          oauth_scaffold_add_line_to_file("./app/views/account/users/edit.html.erb", "<%= render 'account/oauth/stripe_accounts/index', context: @user, stripe_accounts: @user.oauth_stripe_accounts if stripe_enabled? %>", "<% # 🚅 super scaffolding will insert new oauth providers above this line. %>", options, prepend: true)
+          oauth_scaffold_add_line_to_file("./app/views/account/users/_oauth.html.erb", "<%= render 'account/oauth/stripe_accounts/index', context: @user, stripe_accounts: @user.oauth_stripe_accounts if stripe_enabled? %>", "<% # 🚅 super scaffolding will insert new oauth providers above this line. %>", options, prepend: true)
           oauth_scaffold_add_line_to_file("./config/initializers/devise.rb", "config.omniauth :stripe_connect, ENV['STRIPE_CLIENT_ID'], ENV['STRIPE_SECRET_KEY'], {\n    ## specify options for your oauth provider here, e.g.:\n    # scope: 'read_products,read_orders,write_content',\n  }\n", "# 🚅 super scaffolding will insert new oauth providers above this line.", options, prepend: true)
           oauth_scaffold_add_line_to_file("./app/controllers/account/oauth/omniauth_callbacks_controller.rb", "def stripe_connect\n    callback(\"Stripe\", team_id_from_env)\n  end\n", "# 🚅 super scaffolding will insert new oauth providers above this line.", options, prepend: true)
           oauth_scaffold_add_line_to_file("./app/models/team.rb", "has_many :integrations_stripe_installations, class_name: 'Integrations::StripeInstallation', dependent: :destroy if stripe_enabled?", "# 🚅 add oauth providers above.", options, prepend: true)
@@ -122,12 +125,7 @@ module BulletTrain
           oauth_scaffold_add_line_to_file("./Gemfile", "gem 'omniauth-stripe-connect'", "# 🚅 super scaffolding will insert new oauth providers above this line.", options, prepend: true)
           oauth_scaffold_add_line_to_file("./lib/bullet_train.rb", "def stripe_enabled?\n  ENV['STRIPE_CLIENT_ID'].present? && ENV['STRIPE_SECRET_KEY'].present?\nend\n", "# 🚅 super scaffolding will insert new oauth providers above this line.", options, prepend: true)
           oauth_scaffold_add_line_to_file("./lib/bullet_train.rb", "stripe_enabled?,", "# 🚅 super scaffolding will insert new oauth provider checks above this line.", options, prepend: true)
-          oauth_scaffold_add_line_to_file("./app/models/ability.rb", "if stripe_enabled?
-                can [:read, :create, :destroy], Oauth::StripeAccount, user_id: user.id
-                can :manage, Integrations::StripeInstallation, team_id: user.team_ids
-                can :destroy, Integrations::StripeInstallation, oauth_stripe_account: {user_id: user.id}
-              end
-        ", "# 🚅 super scaffolding will insert any new oauth providers above.", options, prepend: true)
+          oauth_scaffold_add_line_to_file("./app/models/ability.rb", "if stripe_enabled?\n        can [:read, :create, :destroy], Oauth::StripeAccount, user_id: user.id\n        can :manage, Integrations::StripeInstallation, team_id: user.team_ids\n        can :destroy, Integrations::StripeInstallation, oauth_stripe_account: {user_id: user.id}\n      end\n", "# 🚅 super scaffolding will insert any new oauth providers above.", options, prepend: true)
 
           # find the database migration that defines this relationship.
           migration_file_name = `grep "create_table #{oauth_transform_string(":oauth_stripe_accounts", options)}" db/migrate/*`.split(":").first
@@ -147,6 +145,11 @@ module BulletTrain
           puts ""
           puts "You'll probably need to `bundle install`.".green
           puts ""
+          puts "You'll need to configure API keys for this provider in `config/application.yml`, like so:"
+          puts ""
+          puts oauth_transform_string("  STRIPE_CLIENT_ID: ...", options)
+          puts oauth_transform_string("  STRIPE_SECRET_KEY: ...", options)
+          puts ""
           puts "If the OAuth provider asks you for some whitelisted callback URLs, the URL structure for those is as so:"
           puts ""
           path = "users/auth/stripe_connect/callback"

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.23"
+    VERSION = "1.0.24"
   end
 end

data/lib/scaffolding/oauth_providers.rb

@@ -1,3 +1,15 @@
+def legacy_resolve_template_path(file)
+  # Figure out the actual location of the file.
+  # Originally all the potential source files were in the repository alongside the application.
+  # Now the files could be provided by an included Ruby gem, so we allow those Ruby gems to register their base
+  # path and then we check them in order to see which template we should use.
+  BulletTrain::SuperScaffolding.template_paths.map do |base_path|
+    base_path = Pathname.new(base_path)
+    resolved_path = base_path.join(file).to_s
+    File.exist?(resolved_path) ? resolved_path : nil
+  end.compact.first || raise("Couldn't find the Super Scaffolding template for `#{file}` in any of the following locations:\n\n#{BulletTrain::SuperScaffolding.template_paths.join("\n")}")
+end
+
 def legacy_replace_in_file(file, before, after)
   puts "Replacing in '#{file}'."
   target_file_content = File.read(file)
@@ -61,14 +73,18 @@ def decode_double_replacement_fix(string)
 end
 
 def oauth_scaffold_directory(directory, options)
+  transformed_directory_name = oauth_transform_string(directory, options)
   begin
-    Dir.mkdir(oauth_transform_string(directory, options))
-  rescue
-    nil
+    Dir.mkdir(transformed_directory_name)
+  rescue Errno::EEXIST => _
+    puts "The directory #{transformed_directory_name} already exists, skipping generation.".yellow
+  rescue Errno::ENOENT => _
+    puts "Proceeding to generate '#{transformed_directory_name}'."
   end
-  Dir.foreach(directory) do |file|
+
+  Dir.foreach(legacy_resolve_template_path(directory)) do |file|
     file = "#{directory}/#{file}"
-    unless File.directory?(file)
+    unless File.directory?(legacy_resolve_template_path(file))
       oauth_scaffold_file(file, options)
     end
   end
@@ -80,7 +96,7 @@ def oauth_scaffold_file(file, options)
   transformed_file_content = []
 
   skipping = false
-  File.open(file).each_line do |line|
+  File.open(legacy_resolve_template_path(file)).each_line do |line|
     if line.include?("# 🚅 skip when scaffolding.")
       next
     end

data/lib/scaffolding/script.rb

@@ -64,11 +64,11 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
           puts ""
           puts "Attributes that end with `_id` or `_ids` trigger awesome, powerful magic in Super Scaffolding. However, because no `#{attribute_options[:class_name]}` class was found defined in `#{file_name}`, you'll need to specify a `class_name` that exists to let us know what model class is on the other side of the association, like so:".red
           puts ""
-          puts "  bin/super-scaffold #{scaffolding_type} #{child}#{" " + parent if parent.present?} #{name}:#{type}[class_name=#{name.gsub(/_ids?$/, "").classify}]".red
+          puts "  bin/super-scaffold #{scaffolding_type} #{child}#{" " + parent if parent.present?} #{name}:#{type}{class_name=#{name.gsub(/_ids?$/, "").classify}}".red
           puts ""
-          puts "If `#{name}` is just a regular field and isn't backed by an ActiveRecord association, you can skip all this with the `[vanilla]` option, e.g.:".red
+          puts "If `#{name}` is just a regular field and isn't backed by an ActiveRecord association, you can skip all this with the `{vanilla}` option, e.g.:".red
           puts ""
-          puts "  bin/super-scaffold #{scaffolding_type} #{child}#{" " + parent if parent.present?} #{name}:#{type}[vanilla]".red
+          puts "  bin/super-scaffold #{scaffolding_type} #{child}#{" " + parent if parent.present?} #{name}:#{type}{vanilla}".red
           puts ""
           exit
         end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: bullet_train
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: indefinite_article
   requirement: !ruby/object:Gem::Requirement