occi-core 4.2.16 → 4.2.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/occi/parser/text.rb +5 -3
  3. data/lib/occi/version.rb +1 -1
  4. metadata +18 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 663a8ff9481f04d4d8638876ddedec499a953d0e
4
- data.tar.gz: 3a898e3fe675a73c8e7a1570f88faed3e0149a90
3
+ metadata.gz: 932727d6a816340f38249b129ee0bd0a0d45b3fd
4
+ data.tar.gz: 11440ad38ab85481195364cdffc345f5f4c57638
5
5
  SHA512:
6
- metadata.gz: c21fd2284cc4192004cc8ddcbd06f84ee9f3620e2b461ed7107720790eb7140496e9b23b9db8d960e82f2254dc4a19d29ae7763a46b6fcb9a9fa320c64c64e76
7
- data.tar.gz: 51dd2d1a4a25d1e0bd4f35a5276287e501433c40d431b1242a2e19fef3ad1c29f8a999a1275cb4cd3ff7eede057f15d800850d27f41b328ad019e6cc4fafa447
6
+ metadata.gz: c4f06c68295288677acea4514c757637face80d11bcff93e45aae9275d456d3e3a02e0eb1019ba9772e6864edd346f878347acdec5169f6f43c9c1ca0f49cf98
7
+ data.tar.gz: 88995c6be7c328fb1cf06c64d5c3edec890a80b86140665c274fcc8f4b401b085eeed075d56a4fe4840fa6193c883c290ede5efd3ec67fe309ab837a0d1f410b
data/lib/occi/parser/text.rb CHANGED
@@ -117,13 +117,15 @@ module Occi
117
117
 
118
118
  attributes = Occi::Core::Attributes.new
119
119
  if match[:attributes]
120
- match[:attributes].split.each do |attribute|
120
+ matched_attributes = match[:attributes].gsub(/\{(immutable|required)\s+(required|immutable)\}/, '{\1_\2}')
121
+ matched_attributes.split.each do |attribute|
122
+ attribute.gsub! /\{(immutable|required)_(required|immutable)\}/, '{\1 \2}'
121
123
  property_string = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, -2]
122
124
  properties = Occi::Core::Properties.new
123
125
 
124
126
  if property_string
125
- properties.required = property_string.include?('{required}')
126
- properties.mutable = !property_string.include?('{immutable}')
127
+ properties.required = property_string.include?('required')
128
+ properties.mutable = !property_string.include?('immutable')
127
129
  end
128
130
 
129
131
  name = attribute[/#{REGEXP_ATTRIBUTE_DEF}/, 1]
data/lib/occi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Occi
2
- VERSION = "4.2.16" unless defined?(::Occi::VERSION)
2
+ VERSION = "4.2.17" unless defined?(::Occi::VERSION)
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: occi-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.16
4
+ version: 4.2.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Florian Feldhaus
@@ -10,76 +10,76 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-07-22 00:00:00.000000000 Z
13
+ date: 2014-10-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: json
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - '>='
19
+ - - ">="
20
20
  - !ruby/object:Gem::Version
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - '>='
26
+ - - ">="
27
27
  - !ruby/object:Gem::Version
28
28
  version: '0'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: hashie
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - '>='
33
+ - - ">="
34
34
  - !ruby/object:Gem::Version
35
35
  version: '0'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - '>='
40
+ - - ">="
41
41
  - !ruby/object:Gem::Version
42
42
  version: '0'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: uuidtools
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - '>='
47
+ - - ">="
48
48
  - !ruby/object:Gem::Version
49
49
  version: 2.1.3
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - '>='
54
+ - - ">="
55
55
  - !ruby/object:Gem::Version
56
56
  version: 2.1.3
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: activesupport
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ~>
61
+ - - "~>"
62
62
  - !ruby/object:Gem::Version
63
63
  version: 4.0.0
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - ~>
68
+ - - "~>"
69
69
  - !ruby/object:Gem::Version
70
70
  version: 4.0.0
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: settingslogic
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - '>='
75
+ - - ">="
76
76
  - !ruby/object:Gem::Version
77
77
  version: '0'
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - '>='
82
+ - - ">="
83
83
  - !ruby/object:Gem::Version
84
84
  version: '0'
85
85
  description: OCCI is a collection of classes to simplify the implementation of the
@@ -92,10 +92,10 @@ executables: []
92
92
  extensions: []
93
93
  extra_rdoc_files: []
94
94
  files:
95
- - .gitignore
96
- - .rspec
97
- - .travis.yml
98
- - .yardopts
95
+ - ".gitignore"
96
+ - ".rspec"
97
+ - ".travis.yml"
98
+ - ".yardopts"
99
99
  - AUTHORS
100
100
  - Gemfile
101
101
  - LICENSE
@@ -237,12 +237,12 @@ require_paths:
237
237
  - lib
238
238
  required_ruby_version: !ruby/object:Gem::Requirement
239
239
  requirements:
240
- - - '>='
240
+ - - ">="
241
241
  - !ruby/object:Gem::Version
242
242
  version: 1.9.3
243
243
  required_rubygems_version: !ruby/object:Gem::Requirement
244
244
  requirements:
245
- - - '>='
245
+ - - ">="
246
246
  - !ruby/object:Gem::Version
247
247
  version: '0'
248
248
  requirements: []