occi-core 4.2.16 → 4.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663a8ff9481f04d4d8638876ddedec499a953d0e
-  data.tar.gz: 3a898e3fe675a73c8e7a1570f88faed3e0149a90
+  metadata.gz: 932727d6a816340f38249b129ee0bd0a0d45b3fd
+  data.tar.gz: 11440ad38ab85481195364cdffc345f5f4c57638
 SHA512:
-  metadata.gz: c21fd2284cc4192004cc8ddcbd06f84ee9f3620e2b461ed7107720790eb7140496e9b23b9db8d960e82f2254dc4a19d29ae7763a46b6fcb9a9fa320c64c64e76
-  data.tar.gz: 51dd2d1a4a25d1e0bd4f35a5276287e501433c40d431b1242a2e19fef3ad1c29f8a999a1275cb4cd3ff7eede057f15d800850d27f41b328ad019e6cc4fafa447
+  metadata.gz: c4f06c68295288677acea4514c757637face80d11bcff93e45aae9275d456d3e3a02e0eb1019ba9772e6864edd346f878347acdec5169f6f43c9c1ca0f49cf98
+  data.tar.gz: 88995c6be7c328fb1cf06c64d5c3edec890a80b86140665c274fcc8f4b401b085eeed075d56a4fe4840fa6193c883c290ede5efd3ec67fe309ab837a0d1f410b

data/lib/occi/parser/text.rb

@@ -117,13 +117,15 @@ module Occi
 
           attributes = Occi::Core::Attributes.new
           if match[:attributes]
-            match[:attributes].split.each do |attribute|
+            matched_attributes = match[: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}')
+                properties.required = property_string.include?('required')
+                properties.mutable = !property_string.include?('immutable')
               end
 
               name = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, 1]

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.16
+  version: 4.2.17
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,76 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
@@ -92,10 +92,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - AUTHORS
 - Gemfile
 - LICENSE
@@ -237,12 +237,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []