occi-core 4.0.0.beta.1 → 4.0.0.beta.2

data/lib/occi/core/attributes.rb

@@ -159,6 +159,10 @@ module Occi
           case value
             when Occi::Core::Attributes
               hash[key] = value.as_json unless value.as_json.size == 0
+            when Occi::Core::Entity
+              hash[key] = value.to_s unless value.to_s.empty?
+            when Occi::Core::Category
+              hash[key] = value.to_s
             else
               hash[key] = value.as_json if value
           end

data/lib/occi/core/entity.rb

@@ -243,7 +243,7 @@ module Occi
         end
         attributes = []
         @attributes.names.each_pair do |name, value|
-          attributes << name + '=' + value.inspect
+          attributes << name + '=' + value.to_s.inspect
         end
         header['X-OCCI-Attribute'] = attributes.join(',') if attributes.any?
         links = []

data/lib/occi/core/link.rb

@@ -37,7 +37,7 @@ module Occi
       # set target attribute of link
       # @param [String] target
       def target=(target)
-        self.attributes['occi.core.target'] = target.to_s
+        self.attributes['occi.core.target'] = target
         @target = target
       end
 
@@ -50,7 +50,7 @@ module Occi
       # set source attribute of link
       # @param [String] source
       def source=(source)
-        self.attributes['occi.core.source'] = source.to_s
+        self.attributes['occi.core.source'] = source
         @source = source
       end
 
@@ -78,11 +78,10 @@ module Occi
         categories = [@kind] + @mixins.join(',').split(',')
         string << ';category=' + categories.join(' ').inspect
         @attributes.names.each_pair do |name, value|
-          value = value.inspect
+          next if value.to_s.blank?
+          value = value.to_s.inspect
           string << ';' + name + '=' + value
         end
-        string << ';occi.core.target=' + self.target.to_s.inspect
-        string << ';occi.core.source=' + self.source.to_s.inspect unless self.source.blank?
 
         string
       end

data/lib/occi/core/resource.rb

@@ -61,7 +61,8 @@ module Occi
       # @return [Hash] hash containing the HTTP headers of the text/occi rendering
       def to_header
         header = super
-        header['Links'] = @links.join(',')
+        header['Links'] = @links.collect {|link| link.to_string }.join(',') if @links.any?
+        header
       end
 
       # @param [Hash] options

data/lib/occi/infrastructure/compute.rb

@@ -101,12 +101,12 @@ module Occi
         @attributes.occi!.compute!.state = state
       end
 
-      def storagelink(target, mixins=[], attributes=Occi::Core::Attributes.new)
-        link(target, Occi::Infrastructure::Storagelink.kind, mixins, attributes, rel=Occi::Infrastructure::Storage.type_identifier)
+      def storagelink(target, mixins=[], attributes=Occi::Core::Attributes.new, kind=Occi::Infrastructure::Storagelink.kind)
+        link(target, kind, mixins, attributes, rel=Occi::Infrastructure::Storage.type_identifier)
       end
 
-      def networkinterface(target, mixins=[], attributes=Occi::Core::Attributes.new)
-        link(target, Occi::Infrastructure::Networkinterface.kind, mixins, attributes)
+      def networkinterface(target, mixins=[], attributes=Occi::Core::Attributes.new, kind=Occi::Infrastructure::Networkinterface.kind)
+        link(target, kind, mixins, attributes, rel=Occi::Infrastructure::Network.type_identifier)
       end
 
       def storagelinks

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.0.0.beta.1" unless defined?(::Occi::VERSION)
+  VERSION = "4.0.0.beta.2" unless defined?(::Occi::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.1
+  version: 4.0.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json