occi-core 5.0.0.beta.15 → 5.0.0.beta.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56685f3371c8b94f29e3f4d87d12fda0a916250b
-  data.tar.gz: 8c41a4eeeda72c459f6041995728ca4690d1901a
+  metadata.gz: 4a0ab29b73d64e17d3196b39205eb9fc2e2c1810
+  data.tar.gz: 46f3633cb5dfb7ece6df2a96c33e6f045f76c170
 SHA512:
-  metadata.gz: 2b90567b813f12511e7b6b3199a8b05c78ba42f9c9603c0f0bcdf668ac2156ebe1d6ec746577181d034f8e4dde88f8188253368fd4a9af646c8e4135f10dbade
-  data.tar.gz: 94f29c71c5866fc05497a1fc2bfd903414be0694f90d4ee362c6a28357748a3a34d63113cf13ceaf0fce44e6a6cf77bac4c93967362172a0125578292bccee0d
+  metadata.gz: fe713635ebab1f64c3b3d953e0bc98b87b4e7d2120483c1307251802951ebaa3e608c06b3ee83c2cce9cac85be1353f0ad565e94246d46748b74a1b3d5acb68b
+  data.tar.gz: b3f9e167697889b2238a3514d6e847a4def422d7454e05001cfd0bb310777767166647f7af6fcc0b2319081171d9b440a98728c181be0b4923133fd279eaee92

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

@@ -11,10 +11,9 @@ module Occi
         class Attributes < Base
           # Typecasting lambdas
           DEFAULT_LAMBDA  = ->(val) { val }
-          STRING_LAMBDA   = ->(val) { val.to_s }
           TYPECASTER_HASH = {
-            IPAddr => STRING_LAMBDA,
-            URI    => STRING_LAMBDA
+            IPAddr => ->(val) { val.host? ? val.to_s : "#{val}/#{val.cidr_mask}" },
+            URI    => ->(val) { val.to_s }
           }.freeze
 
           # Renders the given object to `JSON`.

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

@@ -15,7 +15,8 @@ module Occi
 
           # Known primitive attribute value types
           PRIMITIVE_TYPES = [String, Numeric, Integer, Float, Boolean].freeze
-          QUOTABLE_TYPES  = [IPAddr, URI].freeze
+          IP_TYPES        = [IPAddr].freeze
+          QUOTABLE_TYPES  = [URI].freeze
           JSONABLE_TYPES  = [Array, Hash].freeze
 
           # Renders `object` into plain text and returns the result
@@ -68,18 +69,24 @@ module Occi
 
           # :nodoc:
           def prepare_instance_attribute_value(name, type, value)
-            type_ancestors = type.ancestors
-            if (QUOTABLE_TYPES & type_ancestors).any?
+            if ancestor_match?(IP_TYPES, type)
+              value.host? ? "\"#{value}\"" : "\"#{value}/#{value.cidr_mask}\""
+            elsif ancestor_match?(QUOTABLE_TYPES, type)
               "\"#{value}\""
-            elsif (JSONABLE_TYPES & type_ancestors).any?
+            elsif ancestor_match?(JSONABLE_TYPES, type)
               value.to_json.inspect
-            elsif (PRIMITIVE_TYPES & type_ancestors).any?
+            elsif ancestor_match?(PRIMITIVE_TYPES, type)
               value.inspect
             else
               raise Occi::Core::Errors::RenderingError, "Value #{value.inspect} " \
                     "for attribute #{name} cannot be rendered to text"
             end
           end
+
+          # :nodoc:
+          def ancestor_match?(defined_types, type)
+            (defined_types & type.ancestors).any?
+          end
         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.15'.freeze # use `nil` for production releases
+    STAGE_VERSION = 'beta.16'.freeze # use `nil` for production releases
 
     unless defined?(::Occi::Core::VERSION)
       VERSION = [

data/lib/occi/core.rb

@@ -62,6 +62,7 @@ end
 # Explicitly load monkey patches
 require 'occi/monkey_island/boolean'
 require 'occi/monkey_island/hash'
+require 'occi/monkey_island/ipaddr'
 
 # Explicitly pull in versioning information
 require 'occi/core/version'

data/lib/occi/monkey_island/ipaddr.rb

@@ -0,0 +1,38 @@
+# :nodoc:
+class IPAddr
+  AF_INET_FULL_MASK = 32
+  AF_INET6_FULL_MASK = 128
+
+  attr_reader :mask_addr
+
+  # Converts network mask to CIDR format.
+  #
+  # @return [Integer] CIDR representation of address mask
+  def cidr_mask
+    case family
+    when Socket::AF_INET
+      AF_INET_FULL_MASK - Math.log2((1 << AF_INET_FULL_MASK) - mask_addr).to_i
+    when Socket::AF_INET6
+      AF_INET6_FULL_MASK - Math.log2((1 << AF_INET6_FULL_MASK) - mask_addr).to_i
+    else
+      raise AddressFamilyError, 'unsupported address family'
+    end
+  end
+
+  # :nodoc:
+  def host?
+    case family
+    when Socket::AF_INET
+      cidr_mask == AF_INET_FULL_MASK
+    when Socket::AF_INET6
+      cidr_mask == AF_INET6_FULL_MASK
+    else
+      raise AddressFamilyError, 'unsupported address family'
+    end
+  end
+
+  # :nodoc:
+  def network?
+    !host?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta.15
+  version: 5.0.0.beta.16
 platform: ruby
 authors:
 - Boris Parak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -571,6 +571,7 @@ files:
 - lib/occi/infrastructure_ext/warehouse/mixins/public_net.yml
 - lib/occi/monkey_island/boolean.rb
 - lib/occi/monkey_island/hash.rb
+- lib/occi/monkey_island/ipaddr.rb
 - occi-core.gemspec
 homepage: https://github.com/EGI-FCTF/rOCCI-core
 licenses: