teamable 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1860e39d3cd85c51f07d0a6eafdb2b8fb54fd6857b31b828803ebf96ed83779c
-  data.tar.gz: 4aa1de393a617deaaea7508d7236b60eb6617091766fc654973b4be6b8365462
+  metadata.gz: aef4a40776f50d3acd1148b325ed1be22771bc4d0a0b887dc19922f6919872a4
+  data.tar.gz: 3835d42ce487b9987189fc89d9a50a61d37d6045f7a72002773943052ae0e082
 SHA512:
-  metadata.gz: 1ee01575799e26c74d465da1c28fe90c0e5598c91b24732f17419e2332c27b8f5f12834affedbbe8c505b65e8b97d7ba8690d8454462638e52702bbe4558b629
-  data.tar.gz: fb3521f7e93c51498120d6c17d3a58295dee54d66dd488d2d804023d6822043c7a6083c4ff4f98e6b44eee119e597d54b27fdf0a77da7334fe12d10c88925322
+  metadata.gz: 9c0dd8dd693dc1ad3dd7b27a6376889e3c5e669cf35c54e64002db51862a0f3f179c023c67f09654076073605d24b9ba9a4729bb592759c5dc929b038aae80c2
+  data.tar.gz: 2ba7c15ec33d622960056bf4976c427b48b66f0ffa21c6330139cf9fc37e43e608b52430719679434cf1dc2a049725ae237ba44e47a0d1044550bc805885dcd4

data/README.md

@@ -34,7 +34,7 @@ When building your customized account switcher, redirect your user to `switch_ac
 
 ```ruby
 current_user.accounts.each do |account|
- button_to account.name, switch_account_path(account), method: :patch
+  button_to account.name, switch_account_path(account), method: :patch
 end
 ```
 
@@ -44,7 +44,7 @@ Installation
 Add the following line to Gemfile:
 
 ```ruby
-gem "teamable", github: "kiqr/teamable" # Use Github repo to use alpha release.
+gem "teamable", "~> 0.2.0"
 ```
 
 and run `bundle install` from your terminal to install it.
@@ -122,7 +122,7 @@ should) specify a dependency on this gem using the [Pessimistic Version
 Constraint](http://guides.rubygems.org/patterns/#pessimistic-version-constraint) with two digits of precision. For example:
 
 ```ruby
-gem "teamable", "~> 1.0"
+gem "teamable", "~> 0.2.0"
 ```
 
 License

data/lib/generators/teamable/install_generator.rb

@@ -37,7 +37,7 @@ module Teamable
     end
 
     def add_route
-      route 'teamable "account"'
+      route 'teamable "team"'
     end
 
     private

data/lib/teamable/controllers/current_account_helper.rb

@@ -43,9 +43,7 @@ module Teamable
       # Load current account from Account model and store it
       # in the Teamable::Current singleton.
       def load_current_account
-        return unless user_signed_in?
-
-        Teamable::Current.account ||= account_from_params || current_user.personal_account || nil
+        Teamable::Current.account ||= account_from_params || account_from_personal_account || nil
       end
 
       # Try to load current account using session[:teamable_account_id]
@@ -55,12 +53,11 @@ module Teamable
         current_user.accounts.find_puid(params[:account_id])
       end
 
-      # Finds last joined account if the user have any associated accounts.
-      def fallback_account
-        memberships = current_user.members
-        return nil if memberships.empty?
+      # Try to load current account using current_user.personal_account
+      def account_from_personal_account
+        return unless defined?(current_user) && !current_user.nil?
 
-        memberships.last.account # Return last joined account.
+        current_user&.personal_account
       end
 
       # Check if the current controller is a TeamableController

data/lib/teamable/version.rb

@@ -1,3 +1,3 @@
 module Teamable
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rasmus Kjellberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable