bullet_train 1.0.48 → 1.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f97118eaaa7253406852b09625acb890ba8d2653e0266628795bde576044eec5
-  data.tar.gz: 47688fa0493151a13a4b5060efd32703c9bc9bfa5a4f13052519c6afb6a864a6
+  metadata.gz: 6e120bbb8234554fc860e6bbdbf9376e1899e8c4c3e024075eb84a4dc60b9a10
+  data.tar.gz: 5f144328a9c105ad2b434fe0fccbf514973f54c41c698910fa36c5932ba6fd5e
 SHA512:
-  metadata.gz: 5c750045603680f1d1ffcff0bbc7ffb1e3d334ca6e280f2d4332c2d5270ae94228d0f230876f63223d5aeeca146b5678a8b6fb9ed6b0656b3fecb7b5a751f54e
-  data.tar.gz: 15a90ab25fa884ae6004423c6469d2dd974f08da0c88eae230cbd4e60bfb3c64af1011ff02c2bf6bfe1a732518324c8c55cb0898a10f88ca25e0c9e2059a21a8
+  metadata.gz: 382b6f890fa62609c0600b533958e89d67679bd6ff0c2a71e3c871566d878db20b405970e3dbb8353138e17c9c886df19e502914df51b45908c2091467631268
+  data.tar.gz: d0c09be2dc04291ed0bbe9d94857980e13a72823dea16f85e29edd9596ff8b5e890e46f60bf555bc24e5d8fc04b982bc3b5236711ef21976f1b73bcdf675d2e4

data/app/views/account/users/_oauth.html.erb

@@ -0,0 +1,2 @@
+<%= 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. %>

data/app/views/account/users/edit.html.erb

@@ -23,8 +23,7 @@
       </div>
 
       <div class="xl:col-span-1 space-y-8">
-        <%= 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. %>
+        <%= render 'account/users/oauth' %>
 
         <%= render 'account/shared/box', divider: true do |p| %>
           <% p.content_for :title, t('.password.header') %>

data/app/views/bullet_train/partial_resolver.html.erb

@@ -1,2 +1,3 @@
+<!-- This line is intentionally left blank. -->
 <%= render @needle do |p| %>
 <% end %>

data/docs/super-scaffolding.md

@@ -23,7 +23,7 @@ Bullet Train's Super Scaffolding engine is a unique approach to code generation,
 
 ## Prerequisites
 
-Before getting started with Super Scaffolding, we recommend reading about [the philosophy of domain modeling in Bullet Train](/docs/topics/domain-modeling.md).
+Before getting started with Super Scaffolding, we recommend reading about [the philosophy of domain modeling in Bullet Train](/docs/modeling.md).
 
 ## Usage
 

data/lib/bullet_train/core_ext/string_emoji_helper.rb

@@ -0,0 +1,18 @@
+require "unicode/emoji"
+
+module BulletTrain
+  module CoreExt
+    module StringEmojiHelper
+      def strip_emojis
+        gsub(Unicode::Emoji::REGEX, "")
+      end
+
+      def only_emoji?
+        return false if strip.empty?
+        strip_emojis.strip.empty?
+      end
+    end
+  end
+end
+
+String.include(BulletTrain::CoreExt::StringEmojiHelper)

data/lib/bullet_train/resolver.rb

@@ -92,7 +92,7 @@ module BulletTrain
       result[:absolute_path] = class_path || partial_path || locale_path || file_path
 
       if result[:absolute_path]
-        base_path = "bullet_train" + result[:absolute_path].split("/bullet_train").last
+        base_path = "bullet_train" + result[:absolute_path].partition("/bullet_train").last
 
         # Try to calculate which package the file is from, and what it's path is within that project.
         ["app", "config", "lib"].each do |directory|
@@ -138,7 +138,9 @@ module BulletTrain
 
     def file_path
       # We don't have to do anything here... the absolute path is what we're passed, and we just pass it back.
-      @needle
+      if @needle[0] == "/"
+        @needle
+      end
     end
 
     def locale_path

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.0.48"
+  VERSION = "1.0.51"
 end

data/lib/bullet_train.rb

@@ -9,7 +9,7 @@ require "bullet_train/has_uuid"
 require "bullet_train/scope_validator"
 
 require "colorizer"
-require "string/emoji"
+require "bullet_train/core_ext/string_emoji_helper"
 
 require "devise"
 # require "devise-two-factor"
@@ -97,11 +97,14 @@ def two_factor_authentication_enabled?
   ENV["TWO_FACTOR_ENCRYPTION_KEY"].present?
 end
 
-def any_oauth_enabled?
-  [
-    stripe_enabled?,
-    # 🚅 super scaffolding will insert new oauth provider checks above this line.
-  ].select(&:present?).any?
+# Don't redefine this if an application redefines it locally.
+unless defined?(any_oauth_enabled?)
+  def any_oauth_enabled?
+    [
+      stripe_enabled?,
+      # 🚅 super scaffolding will insert new oauth provider checks above this line.
+    ].select(&:present?).any?
+  end
 end
 
 def invitation_only?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.0.48
+  version: 1.0.51
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -360,6 +360,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-emoji
+  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'
 description: Bullet Train
 email:
 - andrew.culver@gmail.com
@@ -476,6 +490,7 @@ files:
 - app/views/account/users/_breadcrumbs.html.erb
 - app/views/account/users/_fields.html.erb
 - app/views/account/users/_form.html.erb
+- app/views/account/users/_oauth.html.erb
 - app/views/account/users/edit.html.erb
 - app/views/account/users/show.html.erb
 - app/views/bullet_train/partial_resolver.html.erb
@@ -578,11 +593,11 @@ files:
 - docs/webhooks/incoming.md
 - docs/webhooks/outgoing.md
 - lib/bullet_train.rb
+- lib/bullet_train/core_ext/string_emoji_helper.rb
 - lib/bullet_train/engine.rb
 - lib/bullet_train/resolver.rb
 - lib/bullet_train/version.rb
 - lib/colorizer.rb
-- lib/string/emoji.rb
 - lib/tasks/bullet_train_tasks.rake
 homepage: https://github.com/bullet-train-co/bullet_train
 licenses:

data/lib/string/emoji.rb

@@ -1,10 +0,0 @@
-class String
-  def strip_emojis
-    gsub(Unicode::Emoji::REGEX, "")
-  end
-
-  def only_emoji?
-    return false if strip.empty?
-    strip_emojis.strip.empty?
-  end
-end