occi 2.5.13 → 2.5.14

data/lib/occi/core/attribute_properties.rb

@@ -7,7 +7,7 @@ module OCCI
       # @param [Hashie::Mash] attributes
       # @param [Hash] default
       def initialize(attributes = nil, default = nil)
-        if [:Type, :Required, :Mutable, :Pattern, :Default, :Minimum, :Maximum, :Description].any? { |k| attributes.key?(k) }
+        if [:Type, :Required, :Mutable, :Pattern, :Default, :Minimum, :Maximum, :Description].any? { |k| attributes.key?(k.capitalize) }
           attributes[:Type]   ||= "string"
           attributes[:Required] ||= false
           attributes[:Mutable]  ||= false
@@ -19,7 +19,7 @@ module OCCI
       # @return [Array] list of full attribute names
       def combine
         array = []
-        self.each_key do |key|
+        self.each_key do |key| || self[key].key?('type')
           if self[key].key? 'Type'
             array << key
           else
@@ -35,7 +35,7 @@ module OCCI
       def combine_with_defaults
         hash = { }
         self.each_key do |key|
-          if self[key].include? 'Type'
+          if self[key].include? 'Type' || self[key].include?('type')
             hash[key] = self[key]['Default']
           else
             self[key].combine_with_defaults.each { |k, v| hash[key + '.' + k] = v }
@@ -66,11 +66,11 @@ module OCCI
           when "="
             key = match[1]
             self[key] = args.first
-            if %w|Type Required Mutable Pattern Default Minimum Maximum Description|.any? { |k| key.to_s == k }
-              self["Type"] = "string" unless key?("Type")
-              self["Required"] = false unless key?("Required")
-              self["Mutable"] = false unless key?("Mutable")
-              self["Pattern"] = ".*" unless key?("Pattern")
+            if %w|Type Required Mutable Pattern Default Minimum Maximum Description|.any? { |k| key.to_s.capitalize == k }
+              self["Type"] = "string" unless key?("Type") || key?("type")
+              self["Required"] = false unless key?("Required") || key?("required")
+              self["Mutable"] = false unless key?("Mutable") || key?("mutable")
+              self["Pattern"] = ".*" unless key?("Pattern") || key?("pattern")
             end
           when "?"
             !!self[match[1]]
@@ -86,11 +86,11 @@ module OCCI
       # into Mashes for nesting purposes.
       def []=(key, value) #:nodoc:
         regular_writer(convert_key(key), convert_value(value))
-        if %w|Type Required Mutable Pattern Default Minimum Maximum Description|.any? { |k| key.to_s == k }
-          self["Type"] = "string" unless key?("Type")
-          self["Required"] = false unless key?("Required")
-          self["Mutable"] = false unless key?("Mutable")
-          self["Pattern"] = ".*" unless key?("Pattern")
+        if %w|Type Required Mutable Pattern Default Minimum Maximum Description|.any? { |k| key.to_s.capitalize == k }
+          self["Type"] = "string" unless key?("Type") || key?("type")
+          self["Required"] = false unless key?("Required") || key?("required")
+          self["Mutable"] = false unless key?("Mutable") || key?("mutable")
+          self["Pattern"] = ".*" unless key?("Pattern") || key?("pattern")
         end
       end
 

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module OCCI
-  VERSION = "2.5.13" unless defined?(::OCCI::VERSION)
-end
+  VERSION = "2.5.14" unless defined?(::OCCI::VERSION)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.5.13
+  version: 2.5.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -248,5 +248,15 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OCCI toolkit
-test_files: []
+test_files:
+- spec/occi/client_spec.rb
+- spec/occi/collection_spec.rb
+- spec/occi/log_spec.rb
+- spec/occi/model_spec.rb
+- spec/occi/parser_spec.rb
+- spec/occi/test.json
+- spec/occi/test.ova
+- spec/occi/test.ovf
+- spec/occiantlr/parser_spec.rb
+- spec/spec_helper.rb
 has_rdoc: