linked_rails 0.0.4.pre.gb0b6aea40 → 0.0.4.pre.gb254a2893

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751c3631475fa9d96f7f3a3918de84d4238b7a12546fa8d7838016cd46543900
-  data.tar.gz: 021fa4f27ea612b5b6f4cbd883985974c5f1272a1988c7868ac44fa9e52a36fd
+  metadata.gz: 3a9f365ba2a3373bce2eaeaa94f02a9c00f7210c5daa4d1793be61bb235c15a6
+  data.tar.gz: a95518605eccf13bf50eb4eaa86ff37b8d397c0c6d074f064b1835054cac9298
 SHA512:
-  metadata.gz: 8c60b2f5c0e2607618b2a9c1f113b9598ba3049a26950f4437c9607cb37ea90de65e9cd08c4e6051714c090e5a999e7c8e1914c83d4e966555534c11508da89c
-  data.tar.gz: 3df0ab9c5efc2109714476e1b8f0d417e54d574dd99eb5bd99075c78bb5cc5762bb25d4d375c54d5a7ff54878d790a18a8c8ddcefb849647ba7844511613b8e9
+  metadata.gz: '0629170f7ef4b431900c358f7aa5e3ce78c2345ada4a472f3385884973051cc81aa73fe3211b19e4c9d1be03fc2e42555426fa0d31d5b9e9d53c748a98527615'
+  data.tar.gz: 29cc55d690cd807975a4b04e2e1b6e8b2f6de81a957382a1bcc49feca9b42f17a25655c7a9552c52584257a4dc1412587838a8fe272866c7cd10b902fe8e0de2

data/app/models/linked_rails/actions/item.rb

@@ -61,17 +61,15 @@ module LinkedRails
       end
 
       def object
-        object_from_var || resource
+        @object = list.instance_exec(&@object) if @object.respond_to?(:call)
+
+        @object || resource
       end
 
       def object_iri
         object&.iri&.anonymous? ? anonymous_object_iri : object&.iri
       end
 
-      def object_root_relative_iri
-        RDF::URI(object_iri.to_s.split(LinkedRails.iri.to_s).second)
-      end
-
       def parent
         return @parent if instance_variable_defined?(:@parent)
 
@@ -154,12 +152,6 @@ module LinkedRails
         LinkedRails.translate(:action, :label, self)
       end
 
-      def object_from_var
-        return @object unless @object.respond_to?(:call)
-
-        @object = list.instance_exec(&@object)
-      end
-
       def policy_expired?
         @policy_expired ||= policy && resource_policy.try(:expired?)
       end

data/app/models/linked_rails/actions/object.rb

@@ -12,8 +12,8 @@ module LinkedRails
       alias parent action
       delegate :object, to: :action
 
-      def root_relative_iri
-        action.object_root_relative_iri
+      def iri
+        action.object_iri
       end
 
       class << self
@@ -30,10 +30,7 @@ module LinkedRails
 
           parent = parent_from_params!(params, user_context)
 
-          object = parent&.object
-          object.instance_variable_set(:@iri, parent.object_iri)
-          object.instance_variable_set(:@root_relative_iri, parent.object_root_relative_iri)
-          object
+          new(action: parent) if parent.object.anonymous_iri?
         end
       end
     end

data/app/models/linked_rails/collection/view.rb

@@ -76,19 +76,19 @@ module LinkedRails
       end
 
       def iris_from_scope?
-        members_query.is_a?(ActiveRecord::Relation) && !polymorphic_collection?(members_query.klass)
+        members_query.is_a?(ActiveRecord::Relation) && !polymorphic_collection?
       end
 
       def members_array
         members_query.to_a
       end
 
-      def polymorphic_collection?(klass)
-        column = klass.inheritance_column
-        polymorphic = klass.columns_hash.include?(column)
+      def polymorphic_collection?
+        column = association_class.inheritance_column
+        polymorphic = association_class.columns_hash.include?(column)
         return false unless polymorphic
 
-        return true if klass.descends_from_active_record?
+        return true if association_class.descends_from_active_record?
 
         members_query.where_values_hash.include?(column) &&
           members_query.where_values_hash[column] != association_class.to_s

data/app/models/linked_rails/form.rb

@@ -120,7 +120,7 @@ module LinkedRails
 
       def has_many(key, **opts)
         opts[:input_field] = Form::Field::AssociationInput
-        opts[:max_count] ||= 99
+        opts[:max_count] = 99
         field(key, **opts)
       end
 

data/app/serializers/linked_rails/actions/object_serializer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module LinkedRails
+  module Actions
+    class ObjectSerializer < LinkedRails.serializer_parent_class
+      has_one :object, predicate: Vocab.owl.sameAs
+    end
+  end
+end

data/app/serializers/linked_rails/collection_serializer.rb

@@ -13,7 +13,6 @@ module LinkedRails
     end
     attribute :serialized_iri_template, predicate: Vocab.ontola[:iriTemplate]
     attribute :iri_template_opts, predicate: Vocab.ontola[:iriTemplateOpts]
-    attribute :download_urls, predicate: Vocab.schema.downloadUrl
     attribute :default_type, predicate: Vocab.ontola[:defaultType], &:type
     attribute :display, predicate: Vocab.ontola[:collectionDisplay] do |object|
       Vocab.ontola["collectionDisplay/#{object.display || :default}"]

data/lib/linked_rails/helpers/delta_helper.rb

@@ -8,9 +8,7 @@ module LinkedRails
       end
 
       def invalidate_collection_delta(collection)
-        iri = collection.is_a?(RDF::Resource) ? collection : collection.iri
-
-        [Vocab.sp[:Variable], Vocab.ontola[:baseCollection], iri, delta_iri(:invalidate)]
+        [Vocab.sp[:Variable], Vocab.ontola[:baseCollection], collection.iri, delta_iri(:invalidate)]
       end
 
       def invalidate_parent_collections_delta(resource)

data/lib/linked_rails/model/collections.rb

@@ -46,8 +46,6 @@ module LinkedRails
         default_filters: {},
         # collection_class [Array<Hash>] The default sortings applied to the collection.
         default_sortings: [{key: Vocab.schema.dateCreated, direction: :desc}],
-        # download_urls [Array<URI>] URLs for downloading the content of this collection
-        download_urls: [],
         # include_members [Boolean] Whether to include the members of this collection.
         include_members: false,
         # iri_template_keys [Array<Sym>] Custom query keys for the iri template
@@ -72,9 +70,7 @@ module LinkedRails
 
       module ClassMethods
         def collection_iri(**opts)
-          fragment = opts.delete(:fragment)
-
-          LinkedRails.iri(path: collection_root_relative_iri(**opts), fragment: fragment)
+          LinkedRails.iri(path: collection_root_relative_iri(**opts))
         end
 
         # Sets the defaults for all collections for this class.

data/lib/linked_rails/model/iri.rb

@@ -10,7 +10,7 @@ module LinkedRails
       end
 
       def anonymous_iri?
-        self.class < ActiveRecord::Base && new_record? && @iri.blank?
+        self.class < ActiveRecord::Base && new_record?
       end
 
       # @return [RDF::URI].
@@ -44,12 +44,7 @@ module LinkedRails
 
       # @return [RDF::URI]
       def root_relative_iri(**opts)
-        return @root_relative_iri if opts.blank? && @root_relative_iri.present?
-
-        root_relative_iri = RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
-        @root_relative_iri = root_relative_iri if opts.blank?
-
-        root_relative_iri
+        RDF::URI(expand_iri_template(**iri_opts.merge(opts)))
       end
 
       # @return [String, Symbol]

data/lib/linked_rails/serializer/actionable.rb

@@ -15,10 +15,10 @@ module LinkedRails
 
       module ClassMethods
         def action_triples(object, _params)
-          if named_object?(object) || object.try(:singular_resource?)
-            object.try(:action_triples) || []
-          else
+          if object.iri.anonymous? && !object.try(:singular_resource?)
             []
+          else
+            object.try(:action_triples) || []
           end
         end
       end

data/lib/linked_rails/serializer.rb

@@ -115,13 +115,7 @@ module LinkedRails
         collection_name = "#{name.to_s.singularize}_collection"
         opts[:association] ||= name
         opts[:polymorphic] ||= true
-
-        action_object = opts.delete(:action_object)
-        opts[:if] ||= -> (object) {
-          return action_object if object.iri.try(:path)&.end_with?('/action_object')
-
-          named_object?(object)
-        }
+        opts[:if] ||= method(:named_object?)
 
         collection_opts = {}
         collection_opts[:page_size] = opts.delete(:page_size) if opts.key?(:page_size)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre.gb0b6aea40
+  version: 0.0.4.pre.gb254a2893
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_response
@@ -305,6 +305,7 @@ files:
 - app/policies/linked_rails/ontology_policy.rb
 - app/policies/linked_rails/sequence_policy.rb
 - app/serializers/linked_rails/actions/item_serializer.rb
+- app/serializers/linked_rails/actions/object_serializer.rb
 - app/serializers/linked_rails/collection/filter_field_serializer.rb
 - app/serializers/linked_rails/collection/filter_option_serializer.rb
 - app/serializers/linked_rails/collection/filter_serializer.rb