bullet_train 1.4.10 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb255b28e3c114edd38ce183c622b4ca05e29c91a2c4dc004c7c934bb41739e
-  data.tar.gz: '018214574b359f8a3cf97a16e6c9a9e2e8417425fbd985d11956a5f1259b1e13'
+  metadata.gz: ab2b266dbfce24f8790dbee6a5f2236dd54c4d91e4064c87a82c44b38c05e3d0
+  data.tar.gz: 4380916c8f6ebc3666d49b34c6fa8034801b3f340e1f4eabd23c790cbe3ded37
 SHA512:
-  metadata.gz: c0655f9e1dc40cd94ffe7b2cfa3a47d4af1e2bb5d69d9a3a61fa1bd92130a97b327f4a06e04b8f4d33b52004b3741dd0156a15e8cf6a580e90d3388455d58fe7
-  data.tar.gz: 8bd6f515e1b00f5b7025d99f0b393846600be31b8a7f4bc6429c1983cc9ca13ebd04f91a501bce1ade4ba5f3f55bbfd577e3d8c8ce929e0d840997b9b371fe9e
+  metadata.gz: 3cbb12faf56930279a8c08d5ba282e11471e22ae1f64e4e0e71db6f51390dd19c8d1697bda2084abf996ccd8419fae509e2e7feb8e1612dbade1350c7b21862a
+  data.tar.gz: 6b27c9f2330243b736aee06122afd9b28b4a7cc7af793ded4a051fa925b1f2e2024a4a2fd040def10efbee0b705ea8194483d78f34d0d408ab3b0bc344b5149b

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

@@ -39,11 +39,6 @@ module Memberships::Base
     scope :current_and_invited, -> { includes(:invitation).where("user_id IS NOT NULL OR invitations.id IS NOT NULL").references(:invitation) }
     scope :current, -> { where("user_id IS NOT NULL") }
     scope :tombstones, -> { includes(:invitation).where("user_id IS NULL AND invitations.id IS NULL AND platform_agent IS FALSE").references(:invitation) }
-
-    # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
-    if billing_enabled?
-      scope :billable, -> { current_and_invited }
-    end
   end
 
   def name

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

@@ -36,14 +36,6 @@ module Records::Base
     scope :newest_updated, -> { order("updated_at DESC") }
     scope :oldest_updated, -> { order("updated_at ASC") }
 
-    # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
-    if billing_enabled?
-      # By default, any model in a collection is considered active for billing purposes.
-      # This can be overloaded in the child model class to specify more specific criteria for billing.
-      # See `app/models/concerns/memberships/base.rb` for an example.
-      scope :billable, -> { order("TRUE") }
-    end
-
     # Microscope adds useful scopes targeting ActiveRecord `boolean`, `date` and `datetime` attributes.
     # https://github.com/mirego/microscope
     acts_as_microscope

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

@@ -22,17 +22,6 @@ module Teams::Base
     # integrations
     has_many :integrations_stripe_installations, class_name: "Integrations::StripeInstallation", dependent: :destroy if stripe_enabled?
 
-    # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
-    if billing_enabled?
-      # subscriptions
-      has_many :billing_subscriptions, class_name: "Billing::Subscription", dependent: :destroy, foreign_key: :team_id
-
-      # TODO We need a way for `bullet_train-billing-stripe` to define these.
-      if defined?(Billing::Stripe::Subscription)
-        has_many :billing_stripe_subscriptions, class_name: "Billing::Stripe::Subscription", dependent: :destroy, foreign_key: :team_id
-      end
-    end
-
     # validations
     validates :name, presence: true
     validates :time_zone, inclusion: {in: ActiveSupport::TimeZone.all.map(&:name)}, allow_nil: true
@@ -68,19 +57,5 @@ module Teams::Base
     self
   end
 
-  # TODO Probably we can provide a way for gem packages to define these kinds of extensions.
-  if billing_enabled?
-    def current_billing_subscription
-      # If by some bug we have two subscriptions, we want to use the one that existed first.
-      # The reasoning here is that it's more likely to be on some legacy plan that benefits the customer.
-      billing_subscriptions.active.order(:created_at).first
-    end
-
-    def needs_billing_subscription?
-      return false if freemium_enabled?
-      billing_subscriptions.active.empty?
-    end
-  end
-
   ActiveSupport.run_load_hooks :bullet_train_teams_base, self
 end

data/docs/upgrades/notable-versions.md

@@ -0,0 +1,63 @@
+# Notable Versions
+
+## v1.4.11 / v1.5.0
+
+In v1.5.0 we made some fairly big changes to the format of system tests. In order to ease the
+transition we shipped a helper in 1.4.11 that you can use to modify your copy of the tests before
+you merge in version 1.5.0. Doing this should reduce the chances for merge conflicts.
+
+To use the helper to modify your tests run this in a console (after updating to v1.4.11):
+
+```
+bin/update/system_tests/use_device_test
+```
+
+Then you should:
+
+* Run the tests to make sure they still pass
+* Commit the updated test files
+* Update to v1.5.0
+
+### About this change
+
+We've introduced a new `device_test` helper that wraps up some of the implementation
+details about running system tests on a variety of devices.
+
+It simplifies the way that we write system tests like this:
+
+```diff
+-  @@test_devices.each do |device_name, display_details|
+-    test "user can so something on a #{device_name}" do
+-      resize_for(display_details)
+-      # actual tests here
+-    end
+-  end
++  device_test "user can do something" do
++    # actual test code
++  end
+```
+
+The specific changes are:
+
+* Remove the enclosing @@test_devices.each do block
+* Remove one level of indentation from test inside those blocks
+* Remove the resize_for(display_details) from tests in those blocks
+* Use `device_test` helper to handle running the test on different devices
+
+
+## v1.3.22
+
+In version 1.3.22 we added an `Address` model. If your app already had an `Address` model you'll
+probably want to reject some of the updates made to the starter repo in this version.
+
+TODO: Can we offer more direction here?
+
+
+## v1.3.0
+
+Version 1.3.0 is when we started explicitly bumping the Bullet Train gems within the starter repo
+every time that we release a new version of the `core` gems. Unfortunately, at that time we were
+only making changes to Gemfile.lock which kind of hides the dependencies, and is often a source of
+merge conflicts that can be hard to sort out.
+
+[See the upgrade guide for getting your app to version 1.3.0](/docs/upgrades/yolo-130)

data/docs/upgrades/options.md

@@ -7,6 +7,8 @@
 * [Upgrade from any version to `1.4.0`](/docs/upgrades/yolo-140.md)
 * [Upgrade from any version to `1.3.0`](/docs/upgrades/yolo-130.md)
 * [Upgrade from `1.3.x` to `1.4.0`](/docs/upgrades/yolo-140.md)
+* [Notable versions](/docs/upgrades/notable-versions)
+
 
 ## About the upgrade process
 
@@ -27,6 +29,8 @@ which is less hidden and is not as prone to having merge conflicts as `Gemfile.l
 As a result of these changes, there are a few different ways that you might choose to upgrade your application
 depending on which version you're currently on.
 
+[Be sure to check our Notable Versions list to see if there's anything tricky about the version you're moving to.](/docs/upgrades/notable-versions)
+
 ## How to find your current version
 
 You can easily find your current version by running `bundle show | grep "bullet_train "`.

data/docs/upgrades/yolo-130.md

@@ -173,6 +173,8 @@ Before doing this you should have already followed the instructions above to get
 
 For purposes of this example we'll assume that you're stepping up from `1.3.0` to `1.3.1`.
 
+[Be sure to check our Notable Versions list to see if there's anything tricky about the version you're moving to.](/docs/upgrades/notable-versions)
+
 ### 1. Make sure you're working with a clean local copy.
 
 ```

data/docs/upgrades/yolo-140.md

@@ -12,6 +12,8 @@
 
 ## Getting to `1.4.0`
 
+[Be sure to check our Notable Versions list to see if there's anything tricky about the version you're moving to.](/docs/upgrades/notable-versions)
+
 ### 1. Make sure you're working with a clean local copy.
 
 ```

data/docs/upgrades.md

@@ -36,6 +36,8 @@ your application.
 
 For the purposes of these instructions we'll assume that you're on version `1.4.0` and are going to upgrade to version `1.4.1`.
 
+[Be sure to check our Notable Versions list to see if there's anything tricky about the version you're moving to.](/docs/upgrades/notable-versions)
+
 ### 2. Make sure you're working with a clean local copy.
 
 ```

data/lib/bullet_train/resolver.rb

@@ -58,17 +58,8 @@ module BulletTrain
               # Look for showcase preview.
               file_name = source_file[:absolute_path].split("/").last
               showcase_partials = Dir.glob(`bundle show bullet_train-themes-light`.chomp + "/app/views/showcase/**/*.html.erb")
-              has_showcase_partial = false
-              showcase_partial = nil
-              showcase_partials.each do |partial|
-                has_showcase_preview = partial.match?(/#{file_name}$/)
-                if has_showcase_preview
-                  showcase_partial = partial
-                  break
-                end
-              end
-
-              if has_showcase_partial
+              showcase_preview = showcase_partials.find { _1.end_with?(file_name) }
+              if showcase_preview
                 puts "Ejecting showcase preview for #{source_file[:relative_path]}"
                 partial_relative_path = showcase_preview.scan(/(?=app\/views\/showcase).*/).last
                 directory = partial_relative_path.split("/")[0..-2].join("/")

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.4.10"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.5.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -753,6 +753,7 @@ files:
 - docs/trademark.md
 - docs/tunneling.md
 - docs/upgrades.md
+- docs/upgrades/notable-versions.md
 - docs/upgrades/options.md
 - docs/upgrades/yolo-130.md
 - docs/upgrades/yolo-140.md