rhino_project_organizations 0.20.0.alpha.0 → 0.20.0.beta.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964db7b13b183284e5d084f8e88897a6a53c6928727e94fa704fe27ae16f6695
-  data.tar.gz: 6193cb3b0ddfc68dd0a91d1bba54b616390e661202ba0dacd17a5c870ce2e40c
+  metadata.gz: fe0d222969d9e996100fa97f1bbc9e108bea08761393b1dc499fe3013ae3a069
+  data.tar.gz: 2a1c60f12b2475dcd4c6ce0ee43812e426016f80b62c63c053e706b2cb608012
 SHA512:
-  metadata.gz: d64ea8c9c217bfda494404739374c492e256af5c1cc359474aca55d600e810111f44dd2cf84c3e15191bb37c05a629c66c06b8f1987371cbcc25580005aa6cfb
-  data.tar.gz: d18518059334d25a8cf40d93e58b1c7157c08bcab8a5c61950c9d04b5da43cfa57894328d3bfeb7486f5e2ace1519c575fa55e017c07b4b5541204e43234652e
+  metadata.gz: a5c6424c003e72e2c699185866879070bd32b944062ce06d68055a84f232cb3dd868ca95dc922708c04676535a208871551cb77f4f0a22e154141df51a18674a
+  data.tar.gz: a5fb9c081d8451d0c7e1afa4b1c17fb4f6aac64298797853f55e4cdc8b8eaf7945c2218203a81982e2030267d24ee2261ed8f4bffe52c335f31f486de5bfc634

data/Rakefile

@@ -28,8 +28,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  t.warning = false
+  t.verbose = false
 end
 
 task default: :test

data/app/models/rhino/role.rb

@@ -4,12 +4,8 @@ module Rhino
   class Role < ApplicationRecord
     self.abstract_class = true
 
-    validates :name, presence: true, uniqueness: true, format: { with: /\A[a-zA-Z_]+\z/, message: "alpha characters only" }
+    validates :name, presence: true, uniqueness: true, format: { with: /\A[a-zA-Z]+\z/, message: "alpha characters only" }
 
     rhino_owner_global
-
-    def display_name
-      name.titleize
-    end
   end
 end

data/app/models/rhino/users_role_invite.rb

@@ -8,9 +8,8 @@ module Rhino
     # FIXME: Only necessary because this module is in tree NUB-910
     rhino_owner :organization if Rhino.resources.include?("Organization")
     rhino_references %i[role organization]
-    rhino_controller :users_role_invite
 
-    before_save :normalize_email
+    rhino_controller :users_role_invite
 
     after_create do
       ::UsersRole.create!(user: ::User.find_by(email:), organization:, role:)
@@ -22,9 +21,5 @@ module Rhino
       def track_invite
         Rhino::SegmentHelper.track_invite(self)
       end
-
-      def normalize_email
-        self.email = email.downcase
-      end
   end
 end

data/app/overrides/devise/invitations_controller_override.rb

@@ -36,7 +36,7 @@ class Devise::InvitationsController
     def set_cookie
       return unless DeviseTokenAuth.cookie_enabled
 
-      auth_header = resource.build_auth_headers(@token.token, @token.client)
+      auth_header = resource.build_auth_header(@token.token, @token.client)
       cookies[DeviseTokenAuth.cookie_name] = DeviseTokenAuth.cookie_attributes.merge(value: auth_header.to_json)
     end
 

data/lib/generators/rhino_organizations/install/install_generator.rb

@@ -42,12 +42,6 @@ module RhinoOrganizations
         inject_into_file 'config/initializers/rhino.rb', optimize_indentation(data, 2), after: /^\s*config\.resources.+\n/
       end
 
-      def install_seeds
-        say 'Copying seed files'
-        copy_file "#{__dir__}/templates/seeds/organizations.rb", 'db/seeds/development/organizations.rb'
-        copy_file "#{__dir__}/templates/seeds/organizations.rb", 'db/seeds/test/organizations.rb'
-      end
-
       def install_active_admin # rubocop:disable Metrics/MethodLength
         say 'Copying rhino_organization ActiveAdmin files and configurations'
         copy_file "#{__dir__}/templates/admin/users_roles.rb", 'app/admin/users_roles.rb'

data/lib/rhino_organizations/engine.rb

@@ -1,20 +1,16 @@
 # frozen_string_literal: true
 
-require "rhino/engine"
-require "rhino_organizations/version"
-
-# https://guides.rubyonrails.org/engines.html#other-gem-dependencies
-require "devise_invitable"
+require 'rhino/engine'
 
 module RhinoOrganizations
   class Engine < ::Rails::Engine
-    config.autoload_paths << File.expand_path("../../lib", __dir__)
+    config.autoload_paths << File.expand_path('../../lib', __dir__)
 
-    initializer "rhino_organizations.register_module" do
+    initializer 'rhino_organizations.register_module' do
       config.after_initialize do
-        if Rhino.resources.include?("Organization")
+        if Rhino.resources.include?('Organization')
           Rhino.registered_modules[:rhino_organizations] = {
-            version: RhinoOrganizations::VERSION::STRING
+            version: RhinoOrganizations::VERSION
           }
         end
       end
@@ -22,13 +18,13 @@ module RhinoOrganizations
 
     # https://guides.rubyonrails.org/engines.html#overriding-models-and-controllers
     # Use root instead of Rails.root to scope for this engine
-    initializer "rhino_organizations.overrides" do
+    initializer 'rhino_organizations.overrides' do
       overrides = "#{root}/app/overrides"
       Rails.autoloaders.main.ignore(overrides)
 
       config.to_prepare do
         # FIXME: Only necessary because this module is in tree NUB-682
-        if Rhino.resources.include?("Organization")
+        if Rhino.resources.include?('Organization')
           Dir.glob("#{overrides}/**/*_override.rb").each do |override|
             load override
           end

data/lib/rhino_organizations/version.rb

@@ -10,7 +10,7 @@ module RhinoOrganizations
     MAJOR = 0
     MINOR = 20
     TINY  = 0
-    PRE   = "alpha.0"
+    PRE   = "beta.22"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_organizations
 version: !ruby/object:Gem::Version
-  version: 0.20.0.alpha.0
+  version: 0.20.0.beta.22
 platform: ruby
 authors:
 - JP Rosevear
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,51 +16,37 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rhino_project_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0.alpha.0
+        version: 0.20.0.beta.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0.alpha.0
-- !ruby/object:Gem::Dependency
-  name: devise_invitable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 0.20.0.beta.22
 description: ''
 email:
-- jp@codalio.com
+- jprosevear@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,7 +77,6 @@ files:
 - lib/generators/rhino_organizations/install/templates/models/role.rb
 - lib/generators/rhino_organizations/install/templates/models/users_role.rb
 - lib/generators/rhino_organizations/install/templates/models/users_role_invite.rb
-- lib/generators/rhino_organizations/install/templates/seeds/organizations.rb
 - lib/rhino_organizations/engine.rb
 - lib/rhino_organizations/test_case.rb
 - lib/rhino_organizations/test_case/organization_controller.rb
@@ -103,7 +88,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,12 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []

data/lib/generators/rhino_organizations/install/templates/seeds/organizations.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "users"
-
-Organization.find_or_create_by(name: "Rhino")
-Role.find_or_create_by(name: "admin")
-UsersRole.find_or_create_by(user: User.first, role: Role.find_by(name: "admin"), organization: Organization.first)