occi-core 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a33d4666ccb0cb6f5319c9c0a313a57659d092f
-  data.tar.gz: 06508a287d3bab6d510dc75e4c330f15fecab503
+  metadata.gz: 9b884e7dad15d650f4b9d82c029a5581176c13fa
+  data.tar.gz: 6fcf4b0cd0141f1aaba9b5287fd6aa5206c165af
 SHA512:
-  metadata.gz: df8f403bc9166fea257c801665645cf61060cb5667854f7a76053d3744f7d1021d77605661805bf55fa649809d51a61187ac8a07dfae89427ff824be8f1e0c03
-  data.tar.gz: 68593e75b588190ee1d8a604594931edac40a1bfded15ca8bba84193859397ada6a2ed16f966ab046d8199918ebc63fe8e3ed4af705b6a39e074a9de476fef5d
+  metadata.gz: 22fffb43cbf87277d3c18453687873a8e37a87c76cfcad265a76e44781a0a3acf1a71a3030b60e299b55ccc9f607f789d9d243defb3f799475666e4890acae77
+  data.tar.gz: 4e50e65a640d86a6ac8f8b0db7dce4418835493e37be5a452d3a63c473a6cbde2545fa7a43db874c37bc730b452c5ee5a866d40cc10e7d66ceacac60de45b3be

data/lib/occi/parser/text.rb

@@ -5,6 +5,7 @@ module Occi
       # Regular expressions
       REGEXP_QUOTED_STRING = /([^"\\]|\\.)*/
       REGEXP_LOALPHA = /[a-z]/
+      REGEXP_ALPHA = /[a-zA-Z]/
       REGEXP_DIGIT = /[0-9]/
       REGEXP_INT = /#{REGEXP_DIGIT}+/
       REGEXP_FLOAT = /#{REGEXP_INT}\.#{REGEXP_INT}/
@@ -14,7 +15,7 @@ module Occi
       # Regular expressions for OCCI
       if Occi::Settings.compatibility
         # Compatibility with terms starting with a number
-        REGEXP_TERM = /(#{REGEXP_LOALPHA}|#{REGEXP_DIGIT})(#{REGEXP_LOALPHA}|#{REGEXP_DIGIT}|-|_)*/
+        REGEXP_TERM = /(#{REGEXP_ALPHA}|#{REGEXP_DIGIT})(#{REGEXP_ALPHA}|#{REGEXP_DIGIT}|-|_)*/
       else
         REGEXP_TERM = /#{REGEXP_LOALPHA}(#{REGEXP_LOALPHA}|#{REGEXP_DIGIT}|-|_)*/
       end
@@ -154,7 +155,7 @@ module Occi
 
         raise "could not match #{string}" unless match
 
-        term = match[:term]
+        term = match[:term].downcase
         scheme = match[:scheme]
         title = match[:title]
         related = match[:rel].to_s.split

data/lib/occi/version.rb

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

data/spec/occi/parser/text_spec.rb

@@ -34,6 +34,15 @@ module Occi
           category.class.should eq Occi::Core::Kind
         end
 
+        it 'parses a string describing an OCCI Category with uppercase term' do
+          category_string = 'Category: TERM;scheme="http://a.a/a#";class=kind'
+
+          category = Occi::Parser::Text.category category_string
+          category.term.should eq 'term'
+          category.scheme.should eq 'http://a.a/a#'
+          category.class.should eq Occi::Core::Kind
+        end
+
       end
 
       describe '.resource' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Florian Feldhaus