occi-core 5.0.0.beta.9 → 5.0.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf964beebc12970fdcaf0ab624593f4bb73b74f
-  data.tar.gz: 2d8c4b87e3c5948beef5be425e5042478f4734c7
+  metadata.gz: afd95a13c2ec93db744f907fec0ebe077a424f7b
+  data.tar.gz: 1526f8f20ffb41189e25455c759eb5ae79062268
 SHA512:
-  metadata.gz: 7ad87812e470b99636a412f54b09e881d30acbaa01cb371f52f72821cf1166a76cbcf125ab610e292b9443d3dfeb14053acd0232d709889ec16ed03c9e5382a4
-  data.tar.gz: b8be9a5d023b5a944a756f19ae8ff5756671d46c48f910377729d8ba5a51bdd6f1bd7741540203db868c9cf15e3e9d4538a6c466c457d1cb23b6facf86f50fc8
+  metadata.gz: 8a1d1e1b9d6d547d3035c5e9ac2928e8b18395235644158309b7e565c1fba1eecd2f4c5fba1889bae56bb02e3e7679d2d42de716374e00531186f3d15024df5b
+  data.tar.gz: e94eca874b8252507c247a172a45f2c16a448695a73f2785af7d70aa5ab09de10ae7dc33250d65192381a84eba60f299f7691b4cf5fd1eb75ed3a1164debd032

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

@@ -29,7 +29,7 @@ module Occi
               logger.debug "Identified #{action.class}[#{action.identifier}]"
               ai = Occi::Core::ActionInstance.new(action: action)
               ep = Entity.new(model: model)
-              ep.set_attributes!(ai.attributes, parsed[:attributes]) if parsed[:attributes]
+              ep.set_attributes!(ai, parsed[:attributes]) if parsed[:attributes]
 
               logger.debug "Parsed into ActionInstance #{ai.inspect}" if logger_debug?
               ai

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

@@ -70,8 +70,8 @@ module Occi
             logger.debug "Converting #{hash.inspect} into a single instance" if logger_debug?
             instance = @_ib.get hash[:kind], mixins: lookup(hash[:mixins]), actions: lookup(hash[:actions])
 
-            set_attributes! instance.attributes, hash[:attributes]
-            set_links! instance.links, hash[:links] if instance.respond_to?(:links)
+            set_attributes! instance, hash[:attributes]
+            set_links! instance, hash[:links] if instance.respond_to?(:links)
             set_target! instance, hash[:target] if instance.respond_to?(:target)
 
             logger.debug "Created instance #{instance.inspect}" if logger_debug?
@@ -96,18 +96,19 @@ module Occi
 
           # :nodoc:
           def lookup(ary)
-            set = Set.new
-            return set if ary.blank?
-            ary.each { |i| set << handle(Occi::Core::Errors::ParsingError) { model.find_by_identifier!(i) } }
-            set
+            return Set.new if ary.blank?
+            cats = ary.map do |item|
+              handle(Occi::Core::Errors::ParsingError) { model.find_by_identifier!(item) }
+            end
+            Set.new cats
           end
 
           # :nodoc:
-          def set_attributes!(attributes, hash)
+          def set_attributes!(instance, hash)
             return if hash.blank?
             hash.each_pair do |name, value|
               logger.debug "Setting attribute #{name} to #{value.inspect}" if logger_debug?
-              attribute = attributes[name.to_s]
+              attribute = instance.attributes[name.to_s]
               unless attribute
                 raise Occi::Core::Errors::ParsingError,
                       "Attribute #{name.inspect} is not allowed for this entity"
@@ -116,9 +117,10 @@ module Occi
             end
           end
 
-          def set_links!(links, ary)
+          # :nodoc:
+          def set_links!(instance, ary)
             return if ary.blank?
-            ary.each { |l| links << json_single(l).first }
+            ary.each { |l| instance.add_link(json_single(l).first) }
           end
 
           # :nodoc:

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

@@ -175,7 +175,7 @@ module Occi
 
             link = plain_oglink_instance(md)
             link.location = handle(Occi::Core::Errors::ParsingError) { URI.parse md[:self] }
-            entity.links << link
+            entity.add_link link
 
             plain_oglink_attributes! md, link
 

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.9'.freeze # use `nil` for production releases
+    STAGE_VERSION = 'beta.10'.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.9
+  version: 5.0.0.beta.10
 platform: ruby
 authors:
 - Boris Parak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json