occi-core 5.0.0.beta.16 → 5.0.0.beta.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a0ab29b73d64e17d3196b39205eb9fc2e2c1810
-  data.tar.gz: 46f3633cb5dfb7ece6df2a96c33e6f045f76c170
+  metadata.gz: 12e316bc3ef9174ebf47ea762c64444bf481b3b9
+  data.tar.gz: a372534fbfbea3aa689e76483725fed437476714
 SHA512:
-  metadata.gz: fe713635ebab1f64c3b3d953e0bc98b87b4e7d2120483c1307251802951ebaa3e608c06b3ee83c2cce9cac85be1353f0ad565e94246d46748b74a1b3d5acb68b
-  data.tar.gz: b3f9e167697889b2238a3514d6e847a4def422d7454e05001cfd0bb310777767166647f7af6fcc0b2319081171d9b440a98728c181be0b4923133fd279eaee92
+  metadata.gz: 90ccde6b8820e0be6cc5d3cf595ce75456c2990604aecfbeddec367c56af0811b5877c9a1de23483765df4c4abeb57684e8f82b957841144f1726d1033b4d559
+  data.tar.gz: d42a2e5157c338648adc4c1d16ce8a86724f4d00e155221baedbdf39bfb326f9b3bdaba7d9646210cf29f45e33a3040ff6b74336bdd3a04fd43323c43eec925f

data/lib/occi/core/entity.rb

@@ -295,7 +295,7 @@ module Occi
       #
       # @return [NilClass] when entity instance is valid
       def valid!
-        %i[kind id location title attributes mixins actions].each do |attr|
+        %i[kind location attributes mixins actions].each do |attr|
           unless send(attr)
             raise Occi::Core::Errors::InstanceValidationError,
                   "Missing valid #{attr}"

data/lib/occi/core/helpers/mixin_selector.rb

@@ -34,6 +34,24 @@ module Occi
           select_mixin(filter) \
             || raise(Occi::Core::Errors::InstanceLookupError, "Mixin dependent on #{filter} not found")
         end
+
+        # Returns a list of term of mixins dependent on the given mixin.
+        #
+        # @param mixin [Occi::Core::Mixin] parent mixin
+        # @return [Array] terms of mixins
+        def dependent_terms(mixin)
+          select_mixins(mixin).map(&:term)
+        end
+
+        # @see `dependent_terms`
+        def dependent_term(mixin)
+          [select_mixin(mixin)].compact.map(&:term).first
+        end
+
+        # @see `dependent_term`
+        def dependent_term!(mixin)
+          select_mixin!(mixin).term
+        end
       end
     end
   end

data/lib/occi/core/link.rb

@@ -10,6 +10,9 @@ module Occi
     #
     # @author Boris Parak <parak@cesnet.cz>
     class Link < Entity
+      # Separator in URI PATHs
+      URI_PATH_SEPARATOR = '/'.freeze
+
       attr_accessor :target_kind, :source_kind
 
       # @return [URI] link source
@@ -38,12 +41,22 @@ module Occi
 
       # See `#valid!` on `Occi::Core::Entity`.
       def valid!
+        super
+
         %i[source target].each do |attr|
-          next if send(attr)
-          raise Occi::Core::Errors::InstanceValidationError, "Missing valid #{attr}"
+          next if valid_uri? send(attr)
+          raise Occi::Core::Errors::InstanceValidationError, "Malformed or incomplete occi.core.#{attr}"
         end
+      end
 
-        super
+      # :nodoc:
+      def target_id
+        last_uri_segment target
+      end
+
+      # :nodoc:
+      def source_id
+        last_uri_segment source
       end
 
       protected
@@ -65,6 +78,21 @@ module Occi
         self.target = args.fetch(:target)
         @target_kind = args.fetch(:target_kind)
       end
+
+      # :nodoc:
+      def valid_uri?(uri)
+        uri_path_segments(uri).count > 2
+      end
+
+      # :nodoc:
+      def last_uri_segment(uri)
+        uri_path_segments(uri).last
+      end
+
+      # :nodoc:
+      def uri_path_segments(uri)
+        uri.path.split(URI_PATH_SEPARATOR)
+      end
     end
   end
 end

data/lib/occi/core/resource.rb

@@ -21,14 +21,12 @@ module Occi
       end
 
       # @param links [Set] set of links
-      def links=(links)
-        unless links
-          raise Occi::Core::Errors::InstanceValidationError,
-                'Missing valid links'
-        end
+      def links=(new_links)
+        raise Occi::Core::Errors::InstanceValidationError, 'Missing valid links' unless new_links
+
         @links ||= Set.new
         @links.each { |l| remove_link(l) }
-        links.each { |l| add_link(l) }
+        new_links.each { |l| add_link(l) }
 
         @links
       end
@@ -59,10 +57,8 @@ module Occi
       #
       # @param link [Occi::Core::Link] link to be added
       def add_link(link)
-        unless link
-          raise Occi::Core::Errors::MandatoryArgumentError,
-                'Cannot add a non-existent link'
-        end
+        raise Occi::Core::Errors::MandatoryArgumentError, 'Cannot add a non-existent link' unless link
+
         link.source = location
         link.source_kind = kind
         links << link
@@ -72,10 +68,8 @@ module Occi
       #
       # @param link [Occi::Core::Link] link to be removed
       def remove_link(link)
-        unless link
-          raise Occi::Core::Errors::MandatoryArgumentError,
-                'Cannot remove a non-existent link'
-        end
+        raise Occi::Core::Errors::MandatoryArgumentError, 'Cannot remove a non-existent link' unless link
+
         link.source = nil
         link.source_kind = nil
         links.delete link
@@ -83,12 +77,25 @@ module Occi
 
       # See `#valid!` on `Occi::Core::Entity`.
       def valid!
-        unless links
-          raise Occi::Core::Errors::InstanceValidationError,
-                'Missing valid links'
-        end
-        links.each(&:valid!)
         super
+
+        raise Occi::Core::Errors::InstanceValidationError, 'Missing valid links' unless links
+        links.each(&:valid!)
+      end
+
+      # :nodoc:
+      def links_by_klass(klass)
+        links.select { |l| l.is_a?(klass) }
+      end
+
+      # :nodoc:
+      def links_by_kind(kind)
+        links.select { |l| l.kind == kind }
+      end
+
+      # :nodoc:
+      def links_by_kind_identifier(kind_identifier)
+        links.select { |l| l.kind_identifier == kind_identifier }
       end
 
       protected
@@ -103,8 +110,7 @@ module Occi
         super
 
         return unless args[:links].nil?
-        raise Occi::Core::Errors::MandatoryArgumentError,
-              "Links is a mandatory argument for #{self.class}"
+        raise Occi::Core::Errors::MandatoryArgumentError, "Links is a mandatory argument for #{self.class}"
       end
 
       # :nodoc:

data/lib/occi/core/version.rb

@@ -3,7 +3,7 @@ module Occi
     MAJOR_VERSION = 5                # Major update constant
     MINOR_VERSION = 0                # Minor update constant
     PATCH_VERSION = 0                # Patch/Fix version constant
-    STAGE_VERSION = 'beta.16'.freeze # use `nil` for production releases
+    STAGE_VERSION = 'beta.17'.freeze # use `nil` for production releases
 
     unless defined?(::Occi::Core::VERSION)
       VERSION = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta.16
+  version: 5.0.0.beta.17
 platform: ruby
 authors:
 - Boris Parak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json