occi-core 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96f1134c66ae55f82559690a791227f550e25b0
-  data.tar.gz: 11c99606645e18a9ac247fbbe23df3ba603d1aba
+  metadata.gz: ab90d293ad87442dcc348913d4207b4ab7080355
+  data.tar.gz: baa4a75d3589c093497426c4f62fb73b1c3a13b2
 SHA512:
-  metadata.gz: 3ffb32841f7855e60c9a01d05860d4d787294205a7dc473dd007494fdea846a7fd249e88f5fc62d494df84cf7ccdab0d40d024df1a9dcfa10b2e9a3fc4aa5af4
-  data.tar.gz: 63829be1f49304bd94194824966eef60e9cb17992582297b54c1b840b2d08f1c2b6b21ce11e35bd675137291b25241c1b417e7bac11714bae552742aaf2b310b
+  metadata.gz: 44da88d724d42b4755e614388915154eeaa5ee454de1ae6ff0da007ca49f5c820a4f55fd26d11293aeea1458cdc49ccaa6bc061aef1c9662bf707bcc8d640d30
+  data.tar.gz: afc285a50e24b85ba41b40c8623563f17b31b3e1b1f0653ec35c933fe2511f030531e0080b72a38105fe14aa3f944379e0c7d696306bf200df56d535dd2bdc7f

data/lib/occi/parser/text.rb

@@ -115,21 +115,7 @@ module Occi
           title = match[:title]
           related = match[:rel].to_s.split(/\s+/)
 
-          attributes = Occi::Core::Attributes.new
-          if match[:attributes]
-            match[:attributes].split.each do |attribute|
-              property_string = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, -2]
-              properties = Occi::Core::Properties.new
-
-              if property_string
-                properties.required = property_string.include?('required')
-                properties.mutable = !property_string.include?('immutable')
-              end
-
-              name = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, 1]
-              attributes.merge! name.split('.').reverse.inject(properties) { |a, n| Occi::Core::Attributes.new(n => a) }
-            end
-          end
+          attributes = category_attributes(match[:attributes])
           actions = match[:actions].to_s.split
           location = match[:location]
 
@@ -148,6 +134,30 @@ module Occi
           end
         end
 
+        def category_attributes(matched_attributes)
+          attributes = Occi::Core::Attributes.new
+          return attributes unless matched_attributes
+
+          # TODO: find a better approach to fixing split
+          matched_attributes.gsub! /\{(immutable|required)\s+(required|immutable)\}/, '{\1_\2}'
+
+          matched_attributes.split.each do |attribute|
+            attribute.gsub! /\{(immutable|required)_(required|immutable)\}/, '{\1 \2}'
+            property_string = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, -2]
+            properties = Occi::Core::Properties.new
+
+            if property_string
+              properties.required = property_string.include?('required')
+              properties.mutable = !property_string.include?('immutable')
+            end
+
+            name = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, 1]
+            attributes.merge! name.split('.').reverse.inject(properties) { |a, n| Occi::Core::Attributes.new(n => a) }
+          end
+
+          attributes
+        end
+
         def attribute(string)
           Occi::Log.debug "[#{self}] Parsing through Occi::Parser::Text.attribute"
           # create regular expression from regexp string

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.3.1" unless defined?(::Occi::VERSION)
+  VERSION = "4.3.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.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json