occi-core 5.0.0.beta.5 → 5.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10924a00e47bae93f04879bcfe242c3b4957dc7d
-  data.tar.gz: 1f62fc249445349f361d1a909f9298ad619775a5
+  metadata.gz: aa9a61e70441d1bb4ab60fab3f894e2d3086c1f9
+  data.tar.gz: f8ecee4038e193c81a46dd410e474e8e82f4eaaa
 SHA512:
-  metadata.gz: dbff54906247c5d0205fcbe28391f2fd1a5802ca8abc3f3c808681c4ebb024ac3edd151a9cb6090726d11f2782fb811ebef4604ac082eeb125a0757ae5b72d24
-  data.tar.gz: 3068278a251a5c3cbe077726999ba2d06c610e15689c69e8d1d76149131ad37e10676b132be7ad0d0c6ff534d3197b684baa524ed550d938082c33a9e6b56a39
+  metadata.gz: fc42e510f55fb2f60baaeef56e223bc4d4a4e70f6e715a5e8dae91ed63bef410120a43ca56620eb53656c8aa65ed9fda11e4a06d6dcc48823c854482115de128
+  data.tar.gz: 56318eebcada2880af308767c224f362e03a514c743bd0ba1f3963467269a5f1aafd04b74f52d2acc935547a6e58fa9f0f6cebb51a95f66b0592765335e92896

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 
 matrix:
@@ -14,13 +14,12 @@ matrix:
 branches:
   only:
     - master
-    - 4.3.x
     - next
 
 env:
   - ON_TRAVIS_CI=yes
 
-install: 'gem install bundler -v ">= 1.12" && bundle install --retry=10'
+install: 'gem install bundler -v ">= 1.15" && bundle install --retry=10'
 
 script: 'bundle exec rake acceptance'
 

data/Rakefile

@@ -12,7 +12,10 @@ task spec: 'rcov:all'
 
 Gem::Tasks.new(build: { tar: true, zip: true }, sign: { checksum: true, pgp: false })
 
-RuboCop::RakeTask.new
+desc 'Execute rubocop -D'
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ['-D'] # display cop name
+end
 
 YARD::Rake::YardocTask.new do |t|
   t.stats_options = ['--list-undoc']

data/lib/occi/core/renderers/json/base.rb

@@ -18,8 +18,8 @@ module Occi
           # Shortcuts to interesting object attributes, always prefixed with `object_`
           DELEGATED = %i[
             respond_to? send source target summary kind parent action
-            attributes actions mixins depends applies links rel empty? resources
-            links action_instances
+            attributes actions mixins depends applies rel empty?
+            categories entities resources links action_instances
           ].freeze
           delegate(*DELEGATED, to: :object, prefix: true)
 

data/lib/occi/core/renderers/json/collection.rb

@@ -14,12 +14,11 @@ module Occi
         class Collection < Model
           # :nodoc:
           def render_hash
-            return {} if object_empty?
-            return super if object.only_categories?
+            return {} if object_empty? || object.only_categories?
 
-            if object.only_entities?
+            if ent_no_ai?
               render_entities_hash
-            elsif object.only_action_instances?
+            elsif ai_no_ent?
               render_action_instances_hash
             else
               raise Occi::Core::Errors::RenderingError, 'Cannot render mixed collection to JSON'
@@ -29,10 +28,10 @@ module Occi
           # :nodoc:
           def render_entities_hash
             hsh = {}
-            unless object_resources.blank?
+            if object_resources.any?
               hsh[:resources] = object_resources.collect { |r| Resource.new(r, options).render_hash }
             end
-            unless object_links.blank?
+            if object_links.any?
               hsh[:links] = object_links.collect { |r| Link.new(r, options).render_hash }
             end
             hsh
@@ -45,6 +44,16 @@ module Occi
             end
             ActionInstance.new(object_action_instances.first, options).render_hash
           end
+
+          # :nodoc:
+          def ent_no_ai?
+            object_entities.any? && object_action_instances.empty?
+          end
+
+          # :nodoc:
+          def ai_no_ent?
+            object_action_instances.any? && object_entities.empty?
+          end
         end
       end
     end

data/lib/occi/core/renderers/text/base.rb

@@ -18,6 +18,10 @@ module Occi
 
           attr_accessor :object, :options
 
+          # Shortcuts to interesting object attributes, always prefixed with `object_`
+          DELEGATED = %i[send empty? categories entities resources links action_instances].freeze
+          delegate(*DELEGATED, to: :object, prefix: true)
+
           # Constructs a renderer instance for the given
           # object.
           #

data/lib/occi/core/renderers/text/collection.rb

@@ -16,12 +16,11 @@ module Occi
           #
           # @return [String] textual representation of Object
           def render_plain
-            return '' if object.empty?
-            return super if object.only_categories?
+            return '' if object_empty? || object.only_categories?
 
-            if object.only_entities?
+            if ent_no_ai?
               prepare_instances 'entities'
-            elsif object.only_action_instances?
+            elsif ai_no_ent?
               prepare_instances 'action_instances'
             else
               raise Occi::Core::Errors::RenderingError,
@@ -34,12 +33,11 @@ module Occi
           #
           # @return [Hash] textual representation of Object for headers
           def render_headers
-            return {} if object.empty?
-            return super if object.only_categories?
+            return {} if object_empty? || object.only_categories?
 
-            if object.only_entities?
+            if ent_no_ai?
               prepare_instances 'entities'
-            elsif object.only_action_instances?
+            elsif ai_no_ent?
               prepare_instances 'action_instances'
             else
               raise Occi::Core::Errors::RenderingError,
@@ -51,12 +49,22 @@ module Occi
 
           # :nodoc:
           def prepare_instances(type)
-            if object.send(type).count > 1
+            if object_send(type).count > 1
               raise Occi::Core::Errors::RenderingError,
                     "Cannot render collection with multiple #{type.tr('_', ' ')} to text"
             end
 
-            Occi::Core::Renderers::TextRenderer.render object.send(type).first, options
+            Occi::Core::Renderers::TextRenderer.render object_send(type).first, options
+          end
+
+          # :nodoc:
+          def ent_no_ai?
+            object_entities.any? && object_action_instances.empty?
+          end
+
+          # :nodoc:
+          def ai_no_ent?
+            object_action_instances.any? && object_entities.empty?
           end
         end
       end

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.5'.freeze # use `nil` for production releases
+    STAGE_VERSION = 'beta.6'.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.5
+  version: 5.0.0.beta.6
 platform: ruby
 authors:
 - Boris Parak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -571,7 +571,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The rOCCI toolkit