bullet_train 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a78a3f3d80b6f4d1dd5207eeff10c028f551e4d6a2f2b237091941f9b9640d67
-  data.tar.gz: 3c6cc925170d0f71ed3e9c48336839d834ca809b02162f7a528369a787c2443e
+  metadata.gz: c6a06a235e23a68bf1e4855fb344aadba158538aa2ab823118fbebc252059649
+  data.tar.gz: 2ec8399302ea2e4539e9593b8cabc741e5ad2eb1508a2f29e7591ec614d05098
 SHA512:
-  metadata.gz: 115cb038043cb425ab9e955615373921c6faa22930505656ccd2b6e20b9c4e11a73bbb4d0d696d1f117808ac6070e17a900de5f0132b33c3139e681b99de48a9
-  data.tar.gz: 8203f656d96ba1f4ffaacfcfe70c848f757d5a6d92589819115738b0145a3a627d0cd2069ce504a69dd62cac315df91e7ef8bea9844114d04ed508e84bb0f4dd
+  metadata.gz: 23e1d1200c9139fd37e892cd6bd025a26a22960a9076567ca16b14e6ff24445dbaf2cfe16258078f670beda1d86a7300ed089f4b1fadc72e2d08ee0636747e5e
+  data.tar.gz: b9ee30bfe129d2e9d7492599ead1fe82d0768853f4e39ba03621c12ec2990bd0e4c24359c1d31d171e22908be376628e6411c01c6e4b1376f5eb486d1c941da9

data/app/helpers/attributes_helper.rb

@@ -1,10 +1,10 @@
 module AttributesHelper
   def current_attributes_object
-    @_attributes_helper_objects ? @_attributes_helper_objects.last : nil
+    @_attributes_helper_objects&.last
   end
 
   def current_attributes_strategy
-    @_attributes_helper_strategies ? @_attributes_helper_strategies.last : nil
+    @_attributes_helper_strategies&.last
   end
 
   def with_attribute_settings(options)

data/app/models/billing/mock_limiter.rb

@@ -6,7 +6,11 @@ class Billing::MockLimiter
     []
   end
 
-  def can?(action, model)
+  def can?(action, model, count: 1)
     true
   end
+
+  def exhausted?(model)
+    false
+  end
 end

data/app/models/concerns/records/base.rb

@@ -82,18 +82,17 @@ module Records::Base
 
   # TODO This should really be in the API package and included from there.
   if defined?(BulletTrain::Api)
-    def to_api_json
-      # TODO So many performance improvements available here.
-      controller = "Api::#{BulletTrain::Api.current_version.upcase}::ApplicationController".constantize.new
+    # We default this to the current version of the API, but developers can request a specific version.
+    def to_api_json(api_version = BulletTrain::Api.current_version_numeric)
+      controller = "Api::V#{api_version}::ApplicationController".constantize.new
       # TODO We need to fix host names here.
       controller.request = ActionDispatch::Request.new({})
       local_class_key = self.class.name.underscore.split("/").last.to_sym
-      controller.render_to_string(
-        "api/#{BulletTrain::Api.current_version}/#{self.class.name.underscore.pluralize}/_#{local_class_key}",
-        locals: {
-          local_class_key => self
-        }
-      )
+
+      # Returns a hash, not string.
+      JbuilderTemplate.new(controller.view_context) do |json|
+        json.partial! "api/#{BulletTrain::Api.current_version}/#{self.class.name.underscore.pluralize}/#{local_class_key}", local_class_key => self
+      end.attributes!
     end
   end
 end

data/app/models/concerns/users/base.rb

@@ -9,7 +9,7 @@ module Users::Base
     end
 
     devise :omniauthable
-    devise :pwned_password
+    devise :pwned_password if BulletTrain::Configuration.default.strong_passwords
     devise :registerable
     devise :recoverable
     devise :rememberable

data/app/views/devise/passwords/edit.html.erb

@@ -3,7 +3,7 @@
   <% p.content_for :title, @title %>
   <% p.content_for :body do %>
     <% within_fields_namespace(:update_self) do %>
-      <%= form_for(resource, as: resource_name, url: password_path(resource_name), class: 'form', html: { method: :put }) do |f| %>
+      <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: 'form', method: :put }) do |f| %>
         <%= f.hidden_field :reset_password_token %>
         <%= render 'account/shared/forms/errors', form: f, attributes: [:reset_password_token] %>
         <%= render 'shared/fields/password_field', form: f, method: :password, options: {autofocus: true, autocomplete: "off"} %>

data/lib/bullet_train/configuration.rb

@@ -0,0 +1,15 @@
+module BulletTrain
+  class Configuration
+    attr_accessor :strong_passwords
+
+    @default = Configuration.new
+
+    def initialize
+      self.strong_passwords = true
+    end
+
+    class << self
+      attr_reader :default
+    end
+  end
+end

data/lib/bullet_train/engine.rb

@@ -1,3 +1,18 @@
+begin
+  # We hoist the Devise engine, so its app/views directory is always after ours in a Rails app's view_paths.
+  #
+  # This is a quirk of how Rails engines compose, since engines `prepend_view_path` with their views:
+  # https://github.com/rails/rails/blob/9f141a423d551f7f421f54d1372e65ef6ed1f0be/railties/lib/rails/engine.rb#L606
+  #
+  # If users put devise after bullet_train in their Gemfile, Bundler requires the gems in that order,
+  # and devise's `prepend_view_path` would be called last, thus being prepended ahead of BulletTrain when Rails looks up views.
+  #
+  # Note: if this breaks down in the future, we may want to look into config.railties_order.
+  require "devise"
+rescue LoadError
+  # Devise isn't in the Gemfile, and we don't have any other load order dependencies.
+end
+
 module BulletTrain
   class Engine < ::Rails::Engine
   end

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/lib/bullet_train.rb

@@ -1,6 +1,7 @@
 require "bullet_train/version"
 require "bullet_train/engine"
 require "bullet_train/resolver"
+require "bullet_train/configuration"
 
 require "bullet_train/fields"
 require "bullet_train/roles"
@@ -37,6 +38,14 @@ module BulletTrain
   mattr_accessor :linked_gems, default: ["bullet_train"]
   mattr_accessor :parent_class, default: "Team"
   mattr_accessor :base_class, default: "ApplicationRecord"
+
+  def self.configure
+    if block_given?
+      yield(BulletTrain::Configuration.default)
+    else
+      BulletTrain::Configuration.default
+    end
+  end
 end
 
 def default_url_options_from_base_url

data/lib/tasks/bullet_train_tasks.rake

@@ -118,16 +118,22 @@ namespace :bullet_train do
           when "--link", "--reset"
             set_core_gems(process[:flag], framework_packages)
             stream "bundle install"
-          when "--watch-js"
-            set_npm_packages(process[:flag], framework_packages)
+          when "--watch-js", "--clean-js"
+            package_name = process[:values].pop
+            framework_package = framework_packages.select { |k, v| k.to_s == package_name }
+            if framework_package.empty?
+              puts "Sorry, we couldn't find the package you're looking for.".red
+              puts ""
+
+              npm_packages = framework_packages.select { |name, details| details[:npm].present? }
+              puts "Please enter one of the following package names when running `bin/hack --watch-js` or `bin/hack --clean-js`:"
+              npm_packages.each_with_index do |package, idx|
+                puts "#{idx + 1}. #{package.first}"
+              end
+              exit 1
+            end
 
-            puts "Proceeding to reset your Bullet Train npm packages according to your root directory's `package.json`.".yellow
-            puts "If you press `Ctrl + C` before the process completely exits, just run `bin/hack --clean-js`".yellow
-            set_npm_packages("--clean-js", framework_packages)
-            break
-          when "--clean-js"
-            set_npm_packages(process[:flag], framework_packages)
-            break
+            set_npm_package(process[:flag], framework_package)
           end
         end
 
@@ -194,16 +200,13 @@ namespace :bullet_train do
     `#{ENV["IDE"] || "code"} local/bullet_train-core`
     puts ""
 
-    puts "Bullet Train has a few npm packages, so we will and install those now.".blue
-    puts "We will also watch for any changes in your JavaScript files and recompile as we go.".blue
+    puts "Bullet Train has a few npm packages, but we can only watch one at a time, so we will watch the `bullet_train` package.".blue
+    puts "Any changes in your JavaScript files in this package will be recompiled as we go.".blue
+    puts "Run `bin/hack --watch-js` to see which other npm packages you can watch.".blue
     puts "When you're done, you can hit <Control + C> and we'll clean all off this up.".blue
     puts ""
-    set_npm_packages("--watch-js", framework_packages)
-
-    # Clean up the npm packages after the developer enters `Ctrl + C`.
-    puts "Cleaning up npm packages...".blue
-    puts "If you cancel out of this process early, just run `bin/hack --clean-js` to revert to your original npm packages.".blue
-    set_npm_packages("--clean-js", framework_packages)
+    bt_package = framework_packages.select { |k, v| k == :bullet_train }
+    set_npm_package("--watch-js", bt_package)
 
     puts ""
     puts "OK, here's a list of things this script still doesn't do you for you:".yellow
@@ -246,33 +249,24 @@ namespace :bullet_train do
     File.write("./Gemfile", new_lines.join)
   end
 
-  def set_npm_packages(flag, framework_packages)
-    packages = framework_packages.select { |k, v| v[:npm].present? }.compact
-
-    if flag == "--watch-js"
-      puts "Make sure your server is running before proceeding. When you're ready, press <Enter>".blue
-      $stdin.gets.strip
-
-      puts "Linking npm packages...".blue
-      puts ""
-
-      yarn_watch_command = []
-      packages.each do |package_name, details|
-        puts "Linking JavaScript for #{package_name}".blue
-        stream "cd local/bullet_train-core/#{package_name} && yarn install && npm_config_yes=true && npx yalc link && cd ../../.. && npm_config_yes=true npx yalc link \"#{details[:npm]}\""
-        puts "#{package_name} has been linked.".blue
+  def set_npm_package(flag, package)
+    package.each do |name, details|
+      if flag == "--watch-js"
+        puts "Make sure your server is running before proceeding. When you're ready, press <Enter>".blue
+        $stdin.gets.strip
+
+        puts "Linking JavaScript for #{name}".blue
+        stream "cd local/bullet_train-core/#{name} && yarn install && npm_config_yes=true && npx yalc link && cd ../../.. && npm_config_yes=true npx yalc link \"#{details[:npm]}\""
+        puts "#{name} has been linked.".blue
+        puts "Preparing to watch changes.".blue
+        stream "yarn --cwd local/bullet_train-core/#{name} watch"
+
+        # Provide a help message after the developer kills the process with `Ctrl + C`.
+        puts "Run `bin/hack --clean-js #{name}` to revert to using the original npm package in your application.".blue
+      elsif flag == "--clean-js"
+        puts "Going back to using original `#{name}` npm package in application.".blue
         puts ""
-        yarn_watch_command << "yarn --cwd local/bullet_train-core/#{package_name} watch"
-      end
-
-      # We use `&` to run the processes in parallel.
-      puts "Preparing to watch changes".blue
-      stream yarn_watch_command.join(" & ")
-    elsif flag == "--clean-js"
-      puts "Resetting packages to their original path".blue
-      puts ""
 
-      packages.each do |package_name, details|
         system "yarn yalc remove #{details[:npm]}"
         system "yarn add #{details[:npm]}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2022-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -664,6 +664,7 @@ files:
 - docs/webhooks/outgoing.md
 - docs/zapier.md
 - lib/bullet_train.rb
+- lib/bullet_train/configuration.rb
 - lib/bullet_train/core_ext/string_emoji_helper.rb
 - lib/bullet_train/engine.rb
 - lib/bullet_train/resolver.rb
@@ -696,7 +697,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Bullet Train