rhino_project_core 0.21.0.beta.44 → 0.21.0.beta.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab10733b21c66a2aa8ac802f0e041d62eb4be44965b2ad20450d65ded5b4810f
-  data.tar.gz: f054c012a1b61256105da6d82fcd2c334708d53d9fe3f35cfb8806552032f2b5
+  metadata.gz: 5523b3587da0f1a5099bb649e0f1243a716a85b27379372ab513c9beb759f3fa
+  data.tar.gz: be28497ecfe5fec48183bdddab3b5a13f4e4c0d4a3fa0e2c01bc9153509bf31e
 SHA512:
-  metadata.gz: 309de9afa5962ba4ab8cf68d1955b1632d6367270b98298265586265a364b0be933a7c3b7420f4b8e05d8051df9a8caa26a7b190eab17590bf7fb3ad2e08a00c
-  data.tar.gz: 29fde4a30fd5349843a65a3686909994ef7e4ffc7a63430339c1a3f7d70a067a0d1adf96ebb4875b6794dcc27702cd4d8e2c4bb92f9b106cb4a6dc31d5b69845
+  metadata.gz: f5728dd8cc8a7cd570b01af965bd87365f216910ac66011b40023d1e8a632be9edf4275de5b66ed1d89ea054c741e6ea55b0393fd1f848c3ee2d8fa5933009f3
+  data.tar.gz: 5a10bba5d890d5f71d8930b34e65de0094130c7b477ffcfc5121877e432103107e45fbf2b360cd4b11bfb1e3741cebe78962b902a7edb47d4ebc554f6890d0cb

data/app/resources/rhino/info_graph.rb

@@ -26,7 +26,7 @@ module Rhino
         g.vertex_iterator { |c| Rhino.resource_classes.each(&c) }
 
         # If its owned by another resoource, link it
-        g.adjacent_iterator { |v, c| c.call(v.resource_owned_by.to_s.camelize.constantize) if v&.resource_owned_by && !v.global_owner? }
+        g.adjacent_iterator { |v, c| c.call(v.owner_class) if v&.resource_owned_by && !v.global_owner? }
 
         g.directed = true
       end

data/lib/rhino/resource/active_record_extension/owner.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Rhino
+  module Resource
+    module ActiveRecordExtension
+      module Owner
+        extend ActiveSupport::Concern
+
+        # The self is actually required to work with class_attribute properly
+        class_methods do
+          def owner_class
+            reflect_on_association(resource_owned_by).klass
+          end
+
+          # Test if rhino_owner[rdoc-ref:rhino_owner] is the global owner
+          # Also available on the instance
+          def global_owned?
+            chained_scope = self
+            while !chained_scope.auth_owner? && !chained_scope.base_owner? && !chained_scope.global_owner?
+              chained_scope = chained_scope.owner_class
+            end
+
+            chained_scope.global_owner?
+          end
+
+          private
+            def simple_joins_for(parent)
+              # FIXME: There is probably a more rubyish way to do this
+              chained_scope = self
+              joins = []
+
+              # The ownership could be a many, so we classify first
+              while chained_scope.owner_class.name != parent.to_s.classify
+                joins << chained_scope.resource_owned_by
+                chained_scope = chained_scope.owner_class
+              end
+              joins << chained_scope.resource_owned_by
+
+              joins.reverse
+            end
+        end
+      end
+    end
+  end
+end

data/lib/rhino/resource/active_record_extension.rb

@@ -5,6 +5,7 @@ require_relative 'active_record_extension/properties'
 require_relative 'active_record_extension/reference'
 require_relative 'active_record_extension/describe'
 require_relative 'active_record_extension/routing'
+require_relative 'active_record_extension/owner'
 require_relative 'active_record_extension/params'
 require_relative 'active_record_extension/serialization'
 require_relative 'active_record_extension/search'
@@ -23,6 +24,7 @@ module Rhino
       include Rhino::Resource::ActiveRecordExtension::Reference
       include Rhino::Resource::ActiveRecordExtension::Describe
       include Rhino::Resource::ActiveRecordExtension::Routing
+      include Rhino::Resource::ActiveRecordExtension::Owner
       include Rhino::Resource::ActiveRecordExtension::Params
       include Rhino::Resource::ActiveRecordExtension::Serialization
       include Rhino::Resource::ActiveRecordExtension::Search

data/lib/rhino/resource/owner.rb

@@ -35,13 +35,13 @@ module Rhino
           self == Rhino.base_owner
         end
 
-        # Test if rhino_owner[rdoc-ref:rhino_owner] is the base owner
+        # Test if rhino_owner[rdoc-ref:rhino_owner] is the global owner
         # Also available on the instance
         def global_owner?
           self.resource_owned_by == :global
         end
 
-        # Test if rhino_owner[rdoc-ref:rhino_owner] is the base owner
+        # Test if rhino_owner[rdoc-ref:rhino_owner] is globally owned at the top of the hierarchy
         # Also available on the instance
         def global_owned?
           chained_scope = self
@@ -89,7 +89,6 @@ module Rhino
         #
         def rhino_owner(name, **_options)
           self.resource_owned_by = name
-          rhino_policy :global if global_owned?
         end
 
         # Sets rhino_owner[rdoc-ref:rhino_owner] to be the base owner
@@ -133,40 +132,40 @@ module Rhino
         end
 
         private
-        def simple_joins_for(parent)
-          # FIXME: There is probably a more rubyish way to do this
-          chained_scope = self
-          joins = []
-
-          # The ownership could be a many, so we classify first
-          while chained_scope.resource_owned_by.to_s.classify != parent.to_s.classify
+          def simple_joins_for(parent)
+            # FIXME: There is probably a more rubyish way to do this
+            chained_scope = self
+            joins = []
+
+            # The ownership could be a many, so we classify first
+            while chained_scope.resource_owned_by.to_s.classify != parent.to_s.classify
+              joins << chained_scope.resource_owned_by
+              chained_scope = chained_scope.resource_owned_by.to_s.classify.constantize
+            end
             joins << chained_scope.resource_owned_by
-            chained_scope = chained_scope.resource_owned_by.to_s.classify.constantize
-          end
-          joins << chained_scope.resource_owned_by
 
-          joins.reverse
-        end
+            joins.reverse
+          end
 
-        def simple_joins_for_base_owner
-          simple_joins_for(Rhino.base_owner)
-        end
+          def simple_joins_for_base_owner
+            simple_joins_for(Rhino.base_owner)
+          end
       end
       # rubocop:enable Style/RedundantSelf
     end
 
     private
-    # We use the parent as the starting point because if the record is not
-    # persisted yet, we won't be able to find it
-    def owner_ids(joins)
-      bo = Rhino.base_owner
+      # We use the parent as the starting point because if the record is not
+      # persisted yet, we won't be able to find it
+      def owner_ids(joins)
+        bo = Rhino.base_owner
 
-      return [] unless owner
+        return [] unless owner
 
-      parent_klass = owner.class
-      pk = parent_klass.primary_key
+        parent_klass = owner.class
+        pk = parent_klass.primary_key
 
-      parent_klass.joins(parent_klass.send(joins)).where("#{pk}": owner[pk]).pluck("#{bo.table_name}.#{bo.primary_key}")
-    end
+        parent_klass.joins(parent_klass.send(joins)).where("#{pk}": owner[pk]).pluck("#{bo.table_name}.#{bo.primary_key}")
+      end
   end
 end

data/lib/rhino/resource.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative 'resource/owner'
-require_relative 'resource/properties'
-require_relative 'resource/reference'
-require_relative 'resource/describe'
-require_relative 'resource/routing'
-require_relative 'resource/params'
-require_relative 'resource/serialization'
-require_relative 'resource/sieves'
+require_relative "resource/owner"
+require_relative "resource/properties"
+require_relative "resource/reference"
+require_relative "resource/describe"
+require_relative "resource/routing"
+require_relative "resource/params"
+require_relative "resource/serialization"
+require_relative "resource/sieves"
 
-require_relative '../../app/policies/rhino/crud_policy'
+require_relative "../../app/policies/rhino/crud_policy"
 
 module Rhino
   module Resource
@@ -25,7 +25,7 @@ module Rhino
     include Rhino::Resource::Sieves
 
     included do
-      class_attribute :_policy_class, default: Rhino::CrudPolicy
+      class_attribute :_policy_class
 
       def owner
         send self.class.resource_owned_by
@@ -41,7 +41,11 @@ module Rhino
 
     class_methods do
       def policy_class
-        _policy_class
+        self._policy_class ||= begin
+          return Rhino::GlobalPolicy if global_owned?
+
+          Rhino::CrudPolicy
+        end
       end
 
       def rhino_policy(policy)

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 21
     TINY  = 0
-    PRE   = "beta.44"
+    PRE   = "beta.46"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.21.0.beta.44
+  version: 0.21.0.beta.46
 platform: ruby
 authors:
 - JP Rosevear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -465,6 +465,7 @@ files:
 - lib/rhino/resource/active_model_extension/serialization.rb
 - lib/rhino/resource/active_record_extension.rb
 - lib/rhino/resource/active_record_extension/describe.rb
+- lib/rhino/resource/active_record_extension/owner.rb
 - lib/rhino/resource/active_record_extension/params.rb
 - lib/rhino/resource/active_record_extension/properties.rb
 - lib/rhino/resource/active_record_extension/properties_describe.rb