occi-core 5.0.0.beta.14 → 5.0.0.beta.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d306e26641639a0b848992726e04c14f787cdc
-  data.tar.gz: 20c6d620598f5826f1be8fdd5b983a7139aa2e40
+  metadata.gz: 56685f3371c8b94f29e3f4d87d12fda0a916250b
+  data.tar.gz: 8c41a4eeeda72c459f6041995728ca4690d1901a
 SHA512:
-  metadata.gz: f7e66f446ce76219515c3ba7b96a90356986ea55d00125c86b718a516dd392d27addce2539f19ca02feda0c3867d06e57933316815adf3d2988777d15aaae189
-  data.tar.gz: 1f1eb32f15a178c930d59b7b288a1bdd02f4623753e837d80e450318b8c7053807cf3d683972a0db7f169d09043ca67001c38d486a704b450086ac4000ee738d
+  metadata.gz: 2b90567b813f12511e7b6b3199a8b05c78ba42f9c9603c0f0bcdf668ac2156ebe1d6ec746577181d034f8e4dde88f8188253368fd4a9af646c8e4135f10dbade
+  data.tar.gz: 94f29c71c5866fc05497a1fc2bfd903414be0694f90d4ee362c6a28357748a3a34d63113cf13ceaf0fce44e6a6cf77bac4c93967362172a0125578292bccee0d

data/.rubocop.yml

@@ -1,12 +1,5 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-05-23 13:39:50 +0200 using RuboCop version 0.40.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
 require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
 
 Metrics/ModuleLength:
   Exclude:

data/.rubocop_todo.yml

@@ -0,0 +1,4 @@
+Style/RescueModifier:
+  Exclude:
+  - 'lib/occi/core/parsers/json/entity.rb'
+  - 'lib/occi/core/parsers/text/entity.rb'

data/examples/rendering/instance.txt

@@ -8,5 +8,5 @@ X-OCCI-Attribute: occi.compute.state="active"
 Link: </compute/89878?action=stop>;rel="http://schemas.ogf.org/occi/infrastructure/compute/action#stop"
 Link: </compute/89878?action=restart>;rel="http://schemas.ogf.org/occi/infrastructure/compute/action#restart"
 Link: </compute/89878?action=suspend>;rel="http://schemas.ogf.org/occi/infrastructure/compute/action#suspend"
-Link: </storage/5401>;rel="http://schemas.ogf.org/occi/infrastructure#storage";self="/link/storagelink/compute_89878_disk_0";category="http://schemas.ogf.org/occi/infrastructure#storagelink";occi.core.id="compute_89878_disk_0";occi.core.title="38d42ca1-f4e9-5b5c-98de-37eb2d26301a";occi.core.target="/storage/5401";occi.core.source="/compute/89878";occi.storagelink.deviceid="/dev/vda";occi.storagelink.state="active"
-Link: </network/24>;rel="http://schemas.ogf.org/occi/infrastructure#network";self="/link/networkinterface/compute_89878_nic_0";category="http://schemas.ogf.org/occi/infrastructure#networkinterface http://schemas.ogf.org/occi/infrastructure/networkinterface#ipnetworkinterface";occi.core.id="compute_89878_nic_0";occi.core.title="public";occi.core.target="/network/24";occi.core.source="/compute/89878";occi.networkinterface.interface="eth0";occi.networkinterface.mac="02:00:93:e4:f2:a3";occi.networkinterface.state="active";occi.networkinterface.address="172.16.0.1"
+Link: </storage/5401>;rel="http://schemas.ogf.org/occi/infrastructure#storage";self="/storagelink/compute_89878_disk_0";category="http://schemas.ogf.org/occi/infrastructure#storagelink";occi.core.id="compute_89878_disk_0";occi.core.title="38d42ca1-f4e9-5b5c-98de-37eb2d26301a";occi.core.target="/storage/5401";occi.core.source="/compute/89878";occi.storagelink.deviceid="/dev/vda";occi.storagelink.state="active"
+Link: </network/24>;rel="http://schemas.ogf.org/occi/infrastructure#network";self="/networkinterface/compute_89878_nic_0";category="http://schemas.ogf.org/occi/infrastructure#networkinterface http://schemas.ogf.org/occi/infrastructure/networkinterface#ipnetworkinterface";occi.core.id="compute_89878_nic_0";occi.core.title="public";occi.core.target="/network/24";occi.core.source="/compute/89878";occi.networkinterface.interface="eth0";occi.networkinterface.mac="02:00:93:e4:f2:a3";occi.networkinterface.state="active";occi.networkinterface.address="172.16.0.1"

data/examples/rendering/model.json

@@ -420,7 +420,7 @@
           "type": "string"
         }
       },
-      "location": "/link/networkinterface/",
+      "location": "/networkinterface/",
       "parent": "http://schemas.ogf.org/occi/core#link",
       "scheme": "http://schemas.ogf.org/occi/infrastructure#",
       "term": "networkinterface",
@@ -531,7 +531,7 @@
           "type": "string"
         }
       },
-      "location": "/link/storagelink/",
+      "location": "/storagelink/",
       "parent": "http://schemas.ogf.org/occi/core#link",
       "scheme": "http://schemas.ogf.org/occi/infrastructure#",
       "term": "storagelink",
@@ -693,7 +693,7 @@
           "type": "string"
         }
       },
-      "location": "/link/securitygrouplink/",
+      "location": "/securitygrouplink/",
       "parent": "http://schemas.ogf.org/occi/core#link",
       "scheme": "http://schemas.ogf.org/occi/infrastructure#",
       "term": "securitygrouplink",

data/examples/rendering/model.txt

@@ -4,8 +4,8 @@ Category: link;scheme="http://schemas.ogf.org/occi/core#";class="kind";title="li
 Category: compute;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="compute resource";rel="http://schemas.ogf.org/occi/core#resource";location="/compute/";attributes="occi.core.id{immutable required} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}";actions="http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend"
 Category: storage;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="storage resource";rel="http://schemas.ogf.org/occi/core#resource";location="/storage/";attributes="occi.core.id{immutable required} occi.core.title occi.core.summary occi.storage.size occi.storage.state";actions="http://schemas.ogf.org/occi/infrastructure/storage/action#online http://schemas.ogf.org/occi/infrastructure/storage/action#offline http://schemas.ogf.org/occi/infrastructure/storage/action#backup http://schemas.ogf.org/occi/infrastructure/storage/action#snapshot http://schemas.ogf.org/occi/infrastructure/storage/action#resize"
 Category: network;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="network resource";rel="http://schemas.ogf.org/occi/core#resource";location="/network/";attributes="occi.core.id{immutable required} occi.core.title occi.core.summary occi.network.vlan occi.network.label occi.network.state{immutable}";actions="http://schemas.ogf.org/occi/infrastructure/network/action#up http://schemas.ogf.org/occi/infrastructure/network/action#down"
-Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="networkinterface link";rel="http://schemas.ogf.org/occi/core#link";location="/link/networkinterface/";attributes="occi.core.id{immutable required} occi.core.title occi.core.target occi.core.source{required} occi.networkinterface.interface{immutable} occi.networkinterface.mac occi.networkinterface.state{immutable}";actions="http://schemas.ogf.org/occi/infrastructure/networkinterface/action#up http://schemas.ogf.org/occi/infrastructure/networkinterface/action#down"
-Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="storage link";rel="http://schemas.ogf.org/occi/core#link";location="/link/storagelink/";attributes="occi.core.id{immutable required} occi.core.title occi.core.target occi.core.source{required} occi.storagelink.deviceid occi.storagelink.mountpoint occi.storagelink.state{immutable}";actions="http://schemas.ogf.org/occi/infrastructure/storagelink/action#online http://schemas.ogf.org/occi/infrastructure/storagelink/action#offline"
+Category: networkinterface;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="networkinterface link";rel="http://schemas.ogf.org/occi/core#link";location="/networkinterface/";attributes="occi.core.id{immutable required} occi.core.title occi.core.target occi.core.source{required} occi.networkinterface.interface{immutable} occi.networkinterface.mac occi.networkinterface.state{immutable}";actions="http://schemas.ogf.org/occi/infrastructure/networkinterface/action#up http://schemas.ogf.org/occi/infrastructure/networkinterface/action#down"
+Category: storagelink;scheme="http://schemas.ogf.org/occi/infrastructure#";class="kind";title="storage link";rel="http://schemas.ogf.org/occi/core#link";location="/storagelink/";attributes="occi.core.id{immutable required} occi.core.title occi.core.target occi.core.source{required} occi.storagelink.deviceid occi.storagelink.mountpoint occi.storagelink.state{immutable}";actions="http://schemas.ogf.org/occi/infrastructure/storagelink/action#online http://schemas.ogf.org/occi/infrastructure/storagelink/action#offline"
 Category: resource_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="resource template";location="/mixin/resource_tpl/"
 Category: os_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="operating system template";location="/mixin/os_tpl/"
 Category: ipnetwork;scheme="http://schemas.ogf.org/occi/infrastructure/network#";class="mixin";title="IP network mixin";location="/mixin/ipnetwork/";attributes="occi.network.address occi.network.gateway occi.network.allocation"

data/lib/occi/core/entity.rb

@@ -22,13 +22,13 @@ module Occi
       include Helpers::InstanceAttributesAccessor
       include Helpers::ArgumentValidator
       include Helpers::InstanceAttributeResetter
+      include Helpers::MixinSelector
 
       attr_accessor :kind, :actions, :attributes, :mixins
       attr_writer :location
 
       ERRORS = [
-        Occi::Core::Errors::AttributeValidationError,
-        Occi::Core::Errors::AttributeDefinitionError,
+        Occi::Core::Errors::AttributeValidationError, Occi::Core::Errors::AttributeDefinitionError,
         Occi::Core::Errors::InstanceValidationError
       ].freeze
 

data/lib/occi/core/errors/instance_lookup_error.rb

@@ -0,0 +1,11 @@
+module Occi
+  module Core
+    module Errors
+      # Custom error class indicating look-up failures on
+      # instances.
+      #
+      # @author Boris Parak <parak@cesnet.cz>
+      class InstanceLookupError < StandardError; end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Occi
+  module Core
+    module Helpers
+      # Introduces mixin-based helpers to every receiver
+      # class. Provides methods to access mixin sub-sets
+      # defined by dependencies.
+      #
+      # @author Boris Parak <parak@cesnet.cz>
+      module MixinSelector
+        # Selects a set of mixins defined by a common dependence. This dependence
+        # must be provided as `filter` and be an instance of `Occi::Core::Mixin` or
+        # its subclass.
+        #
+        # @param filter [Occi::Core::Mixin] mixin to filter by
+        # @return [Set] found mixins
+        def select_mixins(filter)
+          Set.new(mixins.select { |m| m.depends?(filter) })
+        end
+
+        # Selects at most one mixin defined by the given dependence. This dependence
+        # must be provided as `filter` and be an instance of `Occi::Core::Mixin` or
+        # its subclass.
+        #
+        # @param filter [Occi::Core::Mixin] mixin to filter by
+        # @return [Occi::Core::Mixin] found mixin
+        # @return [NilClass] if such mixin is not found
+        def select_mixin(filter)
+          mixins.detect { |m| m.depends?(filter) }
+        end
+
+        # Selects exactly one mixin or raises an error.
+        # @see `select_mixin`
+        def select_mixin!(filter)
+          select_mixin(filter) \
+            || raise(Occi::Core::Errors::InstanceLookupError, "Mixin dependent on #{filter} not found")
+        end
+      end
+    end
+  end
+end

data/lib/occi/core/parsers/json/entity.rb

@@ -25,8 +25,8 @@ module Occi
           TYPECASTER_HASH = {
             IPAddr  => ->(val) { IPAddr.new val },
             URI     => ->(val) { URI.parse val },
-            Float   => ->(val) { val.to_f },
-            Integer => ->(val) { val.to_i }
+            Float   => ->(val) { Float(val) rescue raise(Occi::Core::Errors::ParsingError, "Wrong value #{val}") },
+            Integer => ->(val) { Integer(val) rescue raise(Occi::Core::Errors::ParsingError, "Wrong value #{val}") }
           }.freeze
 
           attr_reader :model

data/lib/occi/core/parsers/text/entity.rb

@@ -24,7 +24,7 @@ module Occi
           # Typecasting lambdas
           DEFAULT_LAMBDA  = ->(val) { raise "#{self} -> Cannot typecast #{val.inspect} to an unknown type" }
 
-          FLOAT_LAMBDA    = ->(val) { val.to_f }
+          FLOAT_LAMBDA    = ->(val) { Float(val) rescue raise(Occi::Core::Errors::ParsingError, "Wrong value #{val}") }
           JSON_LAMBDA     = ->(val) { JSON.parse(val.gsub('\"', '"')) }
 
           TYPECASTER_HASH = {
@@ -33,7 +33,7 @@ module Occi
             String  => ->(val) { val },
             Float   => FLOAT_LAMBDA,
             Numeric => FLOAT_LAMBDA,
-            Integer => ->(val) { val.to_i },
+            Integer => ->(val) { Integer(val) rescue raise(Occi::Core::Errors::ParsingError, "Wrong value #{val}") },
             Boolean => ->(val) { val.casecmp('true') || val.casecmp('yes') },
             Array   => JSON_LAMBDA,
             Hash    => JSON_LAMBDA

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.14'.freeze # use `nil` for production releases
+    STAGE_VERSION = 'beta.15'.freeze # use `nil` for production releases
 
     unless defined?(::Occi::Core::VERSION)
       VERSION = [

data/lib/occi/infrastructure/warehouse/kinds/networkinterface.yml

@@ -3,7 +3,7 @@ term: networkinterface
 schema: http://schemas.ogf.org/occi/infrastructure#
 title: OCCI Infrastructure NetworkInterface
 parent: http://schemas.ogf.org/occi/core#link
-location: /link/networkinterface/
+location: /networkinterface/
 attributes:
   - occi.networkinterface.interface
   - occi.networkinterface.mac

data/lib/occi/infrastructure/warehouse/kinds/storagelink.yml

@@ -3,7 +3,7 @@ term: storagelink
 schema: http://schemas.ogf.org/occi/infrastructure#
 title: OCCI Infrastructure StorageLink
 parent: http://schemas.ogf.org/occi/core#link
-location: /link/storagelink/
+location: /storagelink/
 attributes:
   - occi.storagelink.deviceid
   - occi.storagelink.mountpoint

data/lib/occi/infrastructure_ext/warehouse/kinds/securitygrouplink.yml

@@ -3,7 +3,7 @@ term: securitygrouplink
 schema: http://schemas.ogf.org/occi/infrastructure#
 title: OCCI Infrastructure Security Group link
 parent: http://schemas.ogf.org/occi/core#link
-location: /link/securitygrouplink/
+location: /securitygrouplink/
 attributes:
   - occi.securitygrouplink.state
   - occi.securitygrouplink.state.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta.14
+  version: 5.0.0.beta.15
 platform: ruby
 authors:
 - Boris Parak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -306,6 +306,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - AUTHORS
 - CHANGELOG.md
@@ -352,6 +353,7 @@ files:
 - lib/occi/core/errors/attribute_validation_error.rb
 - lib/occi/core/errors/category_validation_error.rb
 - lib/occi/core/errors/collection_lookup_error.rb
+- lib/occi/core/errors/instance_lookup_error.rb
 - lib/occi/core/errors/instance_validation_error.rb
 - lib/occi/core/errors/location_validation_error.rb
 - lib/occi/core/errors/mandatory_argument_error.rb
@@ -371,6 +373,7 @@ files:
 - lib/occi/core/helpers/instance_attribute_resetter.rb
 - lib/occi/core/helpers/instance_attributes_accessor.rb
 - lib/occi/core/helpers/locatable.rb
+- lib/occi/core/helpers/mixin_selector.rb
 - lib/occi/core/helpers/parser_dereferencer.rb
 - lib/occi/core/helpers/raw_json_parser.rb
 - lib/occi/core/helpers/renderable.rb