occi-core 4.2.3 → 4.2.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDU3NTg4MzhjZGYyMGI0N2Y3M2ViYmRmMTA2ZWI5OWY3YjYwMzcxZA==
+  data.tar.gz: !binary |-
+    OGRmNTk3NmIwZGUwNWQ3ZTlhN2Y4YjA4NDU4MzJkMmIxZDg4NDExMA==
+SHA512:
+  metadata.gz: !binary |-
+    N2E0MTUzMTlmZDlhYzZjYzZjOGZmYjgxNjZlZmY5NzA4NDk5ZmMyOWY0ZmJm
+    ODlkMzJlM2IyN2IzMjI1ODI3NDdjYWI3YTI5OWY0Y2QxYzdjZWUyYTgyN2Uz
+    MmQ4YTU1ZWFhNDlhN2IzNjUwYmRkZDJjZDUxYjRjYmVjZDg3OWM=
+  data.tar.gz: !binary |-
+    ZWNlMTdkYWYwMmNiNzZiZjRjYTExOTFjYzA1OTg2ODgyZjQ0M2UyZDk4Y2Q3
+    ZDg4MmJiYjFjYmU3YWIwYzcyOTdmNDIwOGM4YjNlMmYxNjBhODMwZTczOTI1
+    ZWJkN2EzMzUwZDJiMjBkZWFmM2ZiYjk0MjFmYmNkYTJkMjZkYTI=

data/lib/occi/collection.rb

@@ -153,9 +153,10 @@ module Occi
       collection.mixins = @mixins.collect { |mixin| mixin.as_json } if @mixins.any?
       collection.actions = @actions.collect { |action_category| action_category.as_json } if @actions.any?
       collection.resources = @resources.collect { |resource| resource.as_json } if @resources.any?
+
       # if there is only one resource and the links inside the resource have no location,
       # then these links must be rendered as separate links inside the collection
-      if !collection.resources.nil? && collection.resources.size == 1
+      if collection.resources && collection.resources.size == 1
         if collection.resources.first.links.blank? && @links.empty?
           lnks = @resources.first.links
         else
@@ -165,6 +166,7 @@ module Occi
         lnks = @links
       end
       collection.links = lnks.collect { |link| link.as_json } if lnks.to_a.any?
+
       collection.action = @action.as_json if @action
       collection
     end
@@ -172,22 +174,40 @@ module Occi
     # @return [String] text representation
     def to_text
       text = ""
-      text << self.categories.collect { |category| category.to_text }.join("\n")
-      text << "\n" if self.categories.any?
-      raise "Only one resource allowed for rendering to text/plain" if self.resources.size > 1
-      text << self.resources.collect { |resource| resource.to_text }.join("\n")
-      text << self.links.collect { |link| link.to_text_link }.join("\n")
-      text << self.action.to_text if self.action
+
+      if standalone_links?
+        raise "Only one standalone link allowed for rendering to text/plain" if self.links.size > 1
+        text << self.links.first.to_text
+      elsif standalone_action_instance?
+        text << self.action.to_text
+      else
+        text << self.categories.collect { |category| category.to_text }.join("\n")
+        text << "\n" if self.categories.any?
+        raise "Only one resource allowed for rendering to text/plain" if self.resources.size > 1
+        text << self.resources.first.to_text if self.resources.any?
+        text << self.links.collect { |link| link.to_text_link }.join("\n")
+        text << self.action.to_text if self.action
+      end
+
       text
     end
 
     def to_header
       header = Hashie::Mash.new
-      header['Category'] = self.categories.collect { |category| category.to_string_short }.join(',') if self.categories.any?
-      raise "Only one resource allowed for rendering to text/occi" if self.resources.size > 1
-      header = self.class.header_merge(header, self.resources.first.to_header) if self.resources.any?
-      header['Link'] = self.links.collect { |link| link.to_string }.join(',') if self.links.any?
-      header = self.class.header_merge(header, self.action.to_header) if self.action
+
+      if standalone_links?
+        raise "Only one standalone link allowed for rendering to text/occi" if self.links.size > 1
+        header = self.links.first.to_header
+      elsif standalone_action_instance?
+        header = self.action.to_header
+      else
+        header['Category'] = self.categories.collect { |category| category.to_string_short }.join(',') if self.categories.any?
+        raise "Only one resource allowed for rendering to text/occi" if self.resources.size > 1
+        header = self.class.header_merge(header, self.resources.first.to_header) if self.resources.any?
+        header['Link'] = self.links.collect { |link| link.to_string }.join(',') if self.links.any?
+        header = self.class.header_merge(header, self.action.to_header) if self.action
+      end
+
       header
     end
 
@@ -204,5 +224,13 @@ module Occi
       target
     end
 
+    def standalone_links?
+      !self.links.blank? && self.categories.blank? && self.resources.blank? && self.action.blank?
+    end
+
+    def standalone_action_instance?
+      !self.action.blank? && self.categories.blank? && self.entities.blank?
+    end
+
   end
 end

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.2.3" unless defined?(::Occi::VERSION)
+  VERSION = "4.2.4" unless defined?(::Occi::VERSION)
 end

data/spec/occi/collection_spec.rb

@@ -855,7 +855,7 @@ module Occi
 
       it 'renders text correctly, links only' do
         collection.links << Occi::Core::Link.new
-        expected = "Link: <>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\""
+        expected = "Category: link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.links.first.id}\""
         expect(collection.to_text).to eql(expected)
       end
 
@@ -925,7 +925,8 @@ module Occi
       it 'renders text correctly, links only' do
         collection.links << Occi::Core::Link.new
         expected=Hashie::Mash.new
-        expected["Link"] = "<>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\""
+        expected["Category"] = "link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\""
+        expected["X-OCCI-Attribute"] = "occi.core.id=\"#{collection.links.first.id}\""
         expect(collection.to_header).to eql(expected)
       end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.3
-  prerelease: 
+  version: 4.2.4
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -258,29 +245,25 @@ files:
 homepage: https://github.com/gwdg/rOCCI-core
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3508725164324827292
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OCCI toolkit
 test_files: []