occi-core 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d538f5cdea3d97838599cb47ec683aa741511fb6
-  data.tar.gz: c67bbd9ec02ca318d34107f9e424a11b3a2525da
+  metadata.gz: 982c9d4d37b5b8e86e38e039dce74a1a27c3d0f9
+  data.tar.gz: 8ff90a2a4c11dbeed57dd7ac8e8a5f4a7d14d9ec
 SHA512:
-  metadata.gz: e3906c64af02d6dce2a806d86e21779c92842a159b67c35eb1a29d92ca57bfb853180fa2bb55333b2482407433114cbfdd94520f1cc3b0018cbde20d3ff0070d
-  data.tar.gz: e30e89e7765a35b16981a001b8711cfea3544392ce4e4a06e227a05a612384b50e60d7f161f2bcc74b44e35ac2e0762ce9def7ff962acb874e5530c52c790930
+  metadata.gz: d5b7a5296a00711b0d9b3f1abfc8a6e089aeaf1e5e71c6de83ff987d49dbe65e2e4d0eb0cfbffb16303fc9e772ffbbe111b378f4a072bc5454d941ac93831f48
+  data.tar.gz: 1a5b883d2eef57cdf6ee9dc498e3b9516f34025d2ba2c2193ab7f97d2d766c117dee223d0a5898ba703b215d5d451d7a4da484a59b650fcf14ad5c5e93615901

data/lib/occi/core/entity.rb

@@ -208,11 +208,11 @@ module Occi
 
       # @return [String] text representation
       def to_text
-        text = "Category: #{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\";location=#{self.kind.location.inspect};title=#{self.kind.title.inspect}"
+        text = "Category: #{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\""
         @mixins.each do |mixin|
           scheme, term = mixin.to_s.split('#')
           scheme << '#'
-          text << "\nCategory: #{term};scheme=#{scheme.inspect};class=\"mixin\";location=#{mixin.location.inspect};title=#{mixin.title ? mixin.title.inspect : ''.inspect}"
+          text << "\nCategory: #{term};scheme=#{scheme.inspect};class=\"mixin\""
         end
 
         text << @attributes.to_text
@@ -225,12 +225,12 @@ module Occi
       # @return [Hash] hash containing the HTTP headers of the text/occi rendering
       def to_header
         header = Hashie::Mash.new
-        header['Category'] = "#{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\";location=#{self.kind.location.inspect};title=#{self.kind.title.inspect}"
+        header['Category'] = "#{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\""
 
         @mixins.each do |mixin|
           scheme, term = mixin.to_s.split('#')
           scheme << '#'
-          header['Category'] << ",#{term};scheme=#{scheme.inspect};class=\"mixin\";location=#{mixin.location.inspect};title=#{mixin.title ? mixin.title.inspect : ''.inspect}"
+          header['Category'] << ",#{term};scheme=#{scheme.inspect};class=\"mixin\""
         end
 
         attributes = @attributes.to_header

data/lib/occi/core/kind.rb

@@ -93,7 +93,13 @@ module Occi
       # @param kind [Occi::Core::Kind, String] Kind or Type Identifier of a Kind where relation should be checked.
       # @return [true,false]
       def related_to?(kind)
-        self.parent.to_s == kind.to_s or self.to_s == kind.to_s
+        to_s == kind.to_s || parent.to_s == kind.to_s \
+	  || \
+	(parent.to_s == "http://schemas.ogf.org/occi/infrastructure#network" && kind.to_s == "http://schemas.ogf.org/occi/core#resource") \
+	  || \
+	(parent.to_s == "http://schemas.ogf.org/occi/infrastructure#storage" && kind.to_s == "http://schemas.ogf.org/occi/core#resource") \
+	  || \
+	(parent.to_s == "http://schemas.ogf.org/occi/infrastructure#compute" && kind.to_s == "http://schemas.ogf.org/occi/core#resource")
       end
 
       def entity_type

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -304,7 +304,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - AUTHORS
 - Gemfile
@@ -457,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: OCCI toolkit

data/.travis.yml

@@ -1,30 +0,0 @@
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: 2.3
-    - rvm: ruby-head
-  fast_finish: true
-
-branches:
-  only:
-    - master
-    - 4.0.x
-    - 4.1.x
-    - 4.2.x
-    - 4.3.x
-
-install: 'gem install bundler -v ">= 1.7.12" && bundle install --retry=10'
-
-env:
-  - ON_TRAVIS_CI=yes
-
-sudo: false