occi-core 4.2.17 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932727d6a816340f38249b129ee0bd0a0d45b3fd
-  data.tar.gz: 11440ad38ab85481195364cdffc345f5f4c57638
+  metadata.gz: c980a6949dc159435afb04d6ab6a22be6e7b3033
+  data.tar.gz: 534e9217f9cec71358dd203e9d4feedc756f08a8
 SHA512:
-  metadata.gz: c4f06c68295288677acea4514c757637face80d11bcff93e45aae9275d456d3e3a02e0eb1019ba9772e6864edd346f878347acdec5169f6f43c9c1ca0f49cf98
-  data.tar.gz: 88995c6be7c328fb1cf06c64d5c3edec890a80b86140665c274fcc8f4b401b085eeed075d56a4fe4840fa6193c883c290ede5efd3ec67fe309ab837a0d1f410b
+  metadata.gz: d80e1f03092cc570fc2c8bd9cdec5a69f708cb15d3a6c9465e3b285b5afceb7edca1d0f107fd789e59c4d023396a91df4d9200a20b8db733425c44dcc015c6bf
+  data.tar.gz: a4a9a6aa3d4f91fbe21cd397e12f596fdb337409899616ce1635383778844e914e614906e70918a7f2fafb4476f761ab4261d0fb5353af2338eef21f600abe5b

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -26,9 +26,9 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: oraclejdk7
-    - rvm: 2.1.0
+    - rvm: 2.1
       jdk: openjdk7
-    - rvm: 2.1.0
+    - rvm: 2.1
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: openjdk7
@@ -42,3 +42,4 @@ branches:
     - 4.0.x
     - 4.1.x
     - 4.2.x
+    - 4.3.x

data/Gemfile

@@ -11,5 +11,5 @@ group :development do
   gem 'simplecov'
   gem 'yard'
   gem 'yard-rspec'
-  gem 'debugger', :platforms => :ruby
+  gem 'debugger', :platforms => :ruby if RUBY_VERSION == '1.9.3'
 end

data/README.md

@@ -1,10 +1,10 @@
 rOCCI-core - A Ruby OCCI Framework
 =================================
 
-[![Build Status](https://secure.travis-ci.org/gwdg/rOCCI-core.png)](http://travis-ci.org/gwdg/rOCCI-core)
-[![Dependency Status](https://gemnasium.com/gwdg/rOCCI-core.png)](https://gemnasium.com/gwdg/rOCCI-core)
+[![Build Status](https://secure.travis-ci.org/EGI-FCTF/rOCCI-core.png)](http://travis-ci.org/EGI-FCTF/rOCCI-core)
+[![Dependency Status](https://gemnasium.com/EGI-FCTF/rOCCI-core.png)](https://gemnasium.com/EGI-FCTF/rOCCI-core)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/occi-core.png)](https://badge.fury.io/rb/occi-core)
-[![Code Climate](https://codeclimate.com/github/gwdg/rOCCI-core.png)](https://codeclimate.com/github/gwdg/rOCCI-core)
+[![Code Climate](https://codeclimate.com/github/EGI-FCTF/rOCCI-core.png)](https://codeclimate.com/github/EGI-FCTF/rOCCI-core)
 
 Requirements
 ------------
@@ -12,7 +12,6 @@ Requirements
 ### Ruby
 * Ruby 1.9.3 is required
 * RubyGems have to be installed
-* Rake has to be installed (e.g., `gem install rake`)
 
 ### Examples
 #### For distros based on Debian:
@@ -42,12 +41,10 @@ Installation
 
 To install the most recent stable version
 
-    gem install rake
     gem install occi-core
 
 To install the most recent beta version
 
-    gem install rake
     gem install occi-core --pre
 
 ### From source (dev)
@@ -58,11 +55,11 @@ To install the most recent beta version
 
 To build and install the bleeding edge version from master
 
-    git clone git://github.com/gwdg/rOCCI-core.git
+    git clone git://github.com/EGI-FCTF/rOCCI-core.git
     cd rOCCI-core
     gem install bundler
     bundle install
-    bundle exec rake test
+    bundle exec rake spec
     rake install
 
 ### RVM
@@ -85,56 +82,16 @@ ruby -v
 
 Usage
 -----
-Detailed documentation is available in our [Wiki](https://github.com/gwdg/rOCCI-core/wiki).
-
-### Logging
-
-The OCCI gem includes its own logging mechanism using a message queue. By default, no one is listening to that queue.
-A new OCCI Logger can be initialized by specifying the log destination (either a filename or an IO object like
-STDOUT) and the log level.
-
-    logger = Occi::Log.new STDOUT
-    logger.level = Occi::Log::INFO
-
-You can create multiple Loggers to receive the log output.
-
-You can always, even if there is no logger defined, log output using the class methods of OCCI::Log e.g.
-
-    Occi::Log.info("Test message")
-
-### Registering categories in the OCCI Model
-
-Before the parser may be used, the available categories have to be registered in the OCCI Model.
-
-For categories already specified by the OCCI WG a method exists in the OCCI Model class to register them:
-
-    model = Occi::Model.new
-    model.register_infrastructure
-
-Further categories can either be registered from files which include OCCI collections in JSON format or or from parsed
- JSON objects (e.g. from the query interface of an OCCI service endpoint).
-
-### Parsing OCCI messages
-
-The OCCI gem includes a Parser to easily parse OCCI messages. With a given media type (e.g. json,
-xml or plain text) the parser analyses the content of the message body and, if supplied,
-the message header. As the text/plain and text/occi media type do not clearly distinguish between a message with a
-category and a message with an entity which has a kind, it has to be specified if the message contains a category
-(e.g. for user defined mixins)
-
-OCCI messages can be parsed to an OCCI collection for example like
-
-    media_type = 'text/plain'
-    body = %Q|Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind"|
-    collection=Occi::Parser.parse(media_type, body)
-
-### Using the OCCI model
-
-The occi-core gem includes all OCCI Core classes necessary to handly arbitrary OCCI objects.
+Detailed documentation is available in our [Wiki](https://github.com/EGI-FCTF/rOCCI-core/wiki).
 
 Changelog
 ---------
 
+### Version 4.3
+* Internal updates and bug fixes
+* Updated JSON rendering
+* Updated dependencies
+
 ### Version 4.2
 * Internal changes and bug fixes
 * Extended test coverage
@@ -211,7 +168,7 @@ Development
 
 Checkout latest version from git:
 
-    git clone git://github.com/gwdg/rOCCI-core.git
+    git clone git://github.com/EGI-FCTF/rOCCI-core.git
 
 Change to rOCCI-core folder
 
@@ -223,11 +180,11 @@ Install dependencies
 
 ### Code Documentation
 
-[Code Documentation for rOCCI by YARD](http://rubydoc.info/github/gwdg/rOCCI-core/)
+[Code Documentation for rOCCI by YARD](http://rubydoc.info/github/EGI-FCTF/rOCCI-core/)
 
 ### Continuous integration
 
-[Continuous integration for rOCCI by Travis-CI](http://travis-ci.org/gwdg/rOCCI-core/)
+[Continuous integration for rOCCI by Travis-CI](http://travis-ci.org/EGI-FCTF/rOCCI-core/)
 
 ### Contribute
 

data/lib/occi/core/attributes.rb

@@ -47,15 +47,16 @@ module Occi
 
       def remove(attributes)
         attributes.keys.each do |key|
-          if self.keys.include? key
-            case self[key]
-            when Occi::Core::Attributes
-              self[key].remove attributes[key]
-            else
-              self.delete(key)
-            end
+          next unless self.keys.include?(key)
+
+          case self[key]
+          when Occi::Core::Attributes
+            self[key].remove attributes[key]
+          else
+            self.delete(key)
           end
         end
+
         self
       end
 
@@ -69,6 +70,7 @@ module Occi
             attributes[key] = nil
           end
         end
+
         attributes.converted = true
         attributes
       end
@@ -88,6 +90,7 @@ module Occi
             hash[key] = self[key]
           end
         end
+
         hash
       end
 
@@ -243,6 +246,7 @@ module Occi
       def validate_and_assign(key, value, property_key)
         raise Occi::Errors::AttributeNameInvalidError,
               "Attribute names (as in \"#{key}\") must not begin with underscores" if key =~ /^_/
+
         case value
         when Occi::Core::Attributes
           add_to_hashie(key, value)
@@ -254,19 +258,19 @@ module Occi
           add_to_hashie(key, properties.clone)
           add_to_hashie(property_key, properties.clone)
         when Occi::Core::Entity
-          match_type(value, self[property_key], 'string') if self[property_key]
+          match_type(value, 'string', self[property_key]) if self[property_key]
           add_to_hashie(key, value)
         when Occi::Core::Category
-          match_type(value, self[property_key], 'string') if self[property_key]
+          match_type(value, 'string', self[property_key]) if self[property_key]
           add_to_hashie(key, value)
         when String
-          match_type(value, self[property_key], 'string') if self[property_key]
+          value = interpret_string(value, self[property_key]) if self[property_key]
           add_to_hashie(key, value)
         when Numeric
-          match_type(value, self[property_key], 'number') if self[property_key]
+          match_type(value, 'number', self[property_key]) if self[property_key]
           add_to_hashie(key, value)
         when FalseClass, TrueClass
-          match_type(value, self[property_key], 'boolean') if self[property_key]
+          match_type(value, 'boolean', self[property_key]) if self[property_key]
           add_to_hashie(key, value)
         when NilClass
           add_to_hashie(key, value)
@@ -280,10 +284,31 @@ module Occi
         Hashie::Mash.instance_method(:[]=).bind(self).call(*args)
       end
 
-      def match_type(value, property, expected_type)
+      def interpret_string(value, property)
+        if property.type == 'number' && (/^[.0-9]+$/ =~ value)
+          value = (/^[0-9]+$/ =~ value) ? value.to_i : value.to_f
+          match_type(value, 'number', property)
+        elsif property.type == 'boolean'
+          value = if value.casecmp("yes") == 0 || value.casecmp("true") == 0
+                    true
+                  elsif value.casecmp("no") == 0 || value.casecmp("false") == 0
+                    false
+                  else
+                    value
+                  end
+
+          match_type(value, 'boolean', property)
+        else
+          match_type(value, 'string', property)
+        end
+
+        value
+      end
+
+      def match_type(value, value_type, property)
         raise Occi::Errors::AttributeTypeError,
               "Value #{value} derived from #{value.class} assigned " \
-              "but attribute of type #{property.type} required" unless property.type == expected_type
+              "but attribute of type #{property.type} required" unless property.type == value_type
         match_pattern(property.pattern, value)
       end
 

data/lib/occi/core/resource.rb

@@ -73,8 +73,7 @@ module Occi
       # @return [Hashie::Mash] link as Hashie::Mash to be parsed into a JSON object
       def as_json(options={})
         resource = super
-        link_strings = @links.collect { |link| link.to_s if link.to_s }.compact
-        resource.links = link_strings unless link_strings.empty?
+        resource.links = @links.as_json if @links.any?
         resource
       end
 

data/lib/occi/parser/text.rb

@@ -117,15 +117,13 @@ module Occi
 
           attributes = Occi::Core::Attributes.new
           if match[:attributes]
-            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}'
+            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')
+                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.17" unless defined?(::Occi::VERSION)
+  VERSION = "4.3.0" unless defined?(::Occi::VERSION)
 end

data/lib/occi-core.rb

@@ -1,14 +1,15 @@
 require 'rubygems'
 
-require 'set'
-require 'uri'
-require 'hashie/mash'
-
+require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/json'
 require 'active_support/inflector'
 require 'active_support/notifications'
 
+require 'set'
+require 'uri'
+require 'hashie/mash'
+
 require 'logger'
 require 'uuidtools'
 require 'rubygems/package'

data/occi-core.gemspec

@@ -8,21 +8,21 @@ Gem::Specification.new do |gem|
   gem.name          = 'occi-core'
   gem.version       = Occi::VERSION
   gem.authors       = ['Florian Feldhaus','Piotr Kasprzak', 'Boris Parak']
-  gem.email         = ['florian.feldhaus@gmail.com', 'piotr.kasprzak@gwdg.de', 'xparak@mail.muni.cz']
+  gem.email         = ['florian.feldhaus@gmail.com', 'piotr.kasprzak@gwdg.de', 'parak@cesnet.cz']
   gem.description   = %q{OCCI is a collection of classes to simplify the implementation of the Open Cloud Computing API in Ruby}
   gem.summary       = %q{OCCI toolkit}
-  gem.homepage      = 'https://github.com/gwdg/rOCCI-core'
+  gem.homepage      = 'https://github.com/EGI-FCTF/rOCCI-core'
   gem.license       = 'Apache License, Version 2.0'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'json'
-  gem.add_dependency 'hashie'
-  gem.add_dependency 'uuidtools', '>=2.1.3'
-  gem.add_dependency 'activesupport', '~>4.0.0'
-  gem.add_dependency 'settingslogic'
+  gem.add_dependency 'json', '>= 1.8.1'
+  gem.add_dependency 'hashie', '>= 3.3.1'
+  gem.add_dependency 'uuidtools', '>= 2.1.3'
+  gem.add_dependency 'activesupport', '>= 4.0.0'
+  gem.add_dependency 'settingslogic', '>= 2.0.9'
 
-  gem.required_ruby_version     = '>= 1.9.3'
+  gem.required_ruby_version = '>= 1.9.3'
 end

data/spec/occi/core/attributes_spec.rb

@@ -546,10 +546,18 @@ module Occi
 
 
       context '.validate_and_assign' do
-        let(:attrs){ Occi::Core::Attributes.new }
+        let(:attrs){
+          attrs = Occi::Core::Attributes.new
+          attrs['entity'] = {:type => 'string'}
+          attrs['category'] = {:type => 'string'}
+          attrs['numeric'] = {:type => 'number'}
+          attrs['tr'] = {:type => 'boolean'}
+          attrs['fal'] = {:type => 'boolean'}
+          attrs.convert
+          attrs}
 
         it 'correctly accepts Occi::Core::Attributes' do
-          inattrs = Occi::Core::Attributes.new
+          inattrs = attrs
           inattrs['numbertype'] = { :type => 'number', :default => 42, :mutable => true, :pattern => '^[0-9]+' }
           inattrs.convert
           inattrs['numbertype'] = 13
@@ -559,9 +567,9 @@ module Occi
         end
 
         it 'correctly accepts Occi::Core::Properties' do
+          expected = attrs
           attrs['properties'] = Occi::Core::Properties.new
 
-          expected = Occi::Core::Attributes.new
           expected['properties'] = { :type => 'string', :pattern => '.*', :mutable => false, :required => false }
           expected.convert
 
@@ -569,9 +577,9 @@ module Occi
         end
 
         it 'correctly accepts Hash' do
+          expected = attrs
           attrs['hash'] = { :type => 'string', :pattern => '.*', :mutable => false, :required => false }
 
-          expected = Occi::Core::Attributes.new
           expected['hash'] = { :type => 'string', :pattern => '.*', :mutable => false, :required => false }
           expected.convert
 
@@ -602,16 +610,46 @@ module Occi
           expect(attrs['numeric']).to eql 16
         end
 
+        it 'correctly accepts Numeric given as string' do
+          attrs['numeric'] = '16'
+          expect(attrs['numeric']).to eql 16
+        end
+
+        it 'correctly accepts floating point given as string' do
+          attrs['numeric'] = '16.4'
+          expect(attrs['numeric']).to eql 16.4
+        end
+
+        it 'correctly refuses empty Numeric value' do
+          expect{ attrs['numeric'] = '' }.to raise_exception(Occi::Errors::AttributeTypeError)
+        end
+
+        it 'correctly refuses malformed Numeric value' do
+          expect{ attrs['numeric'] = '1.b' }.to raise_exception(Occi::Errors::AttributeTypeError)
+          expect{ attrs['numeric'] = '.b' }.to raise_exception(Occi::Errors::AttributeTypeError)
+          expect{ attrs['numeric'] = 'b.1' }.to raise_exception(Occi::Errors::AttributeTypeError)
+        end
+
         it 'correctly accepts TrueClass' do
           attrs['tr'] = true
           expect(attrs['tr']).to eql true
         end
 
+        it 'correctly accepts TrueClass given as string' do
+          attrs['tr'] = 'true'
+          expect(attrs['tr']).to eql true
+        end
+
         it 'correctly accepts FalseClass' do
           attrs['fal'] = false
           expect(attrs['fal']).to eql false
         end
 
+        it 'correctly accepts FalseClass given as string' do
+          attrs['fal'] = 'false'
+          expect(attrs['fal']).to eql false
+        end
+
         it 'correctly responds to NilClass' do
           attrs['nil'] = nil
           expect(attrs['nil']).to eql nil

data/spec/occi/core/resource_spec.rb

@@ -1,12 +1,12 @@
 module Occi
   module Core
     describe Resource do
-      let(:resource){ resource = Occi::Core::Resource.new 
+      let(:resource){ resource = Occi::Core::Resource.new
         resource.link target
         resource.attributes.occi!.core!.summary = "Resource Summary"
         resource }
       let(:target){ target = Occi::Core::Resource.new }
-      
+
       context '#link' do
         it "creates the appropriate No. of links" do
           expect(resource.links.count).to eq 1
@@ -17,7 +17,17 @@ module Occi
         end
 
         it 'sets the right target' do
-          expect(resource.links.first.target).to eql target.to_s
+          expect(resource.links.first.target).to eq target.to_s
+        end
+
+        it 'sets the right source' do
+          expect(resource.links.first.source).to eq resource.to_s
+        end
+      end
+
+      context '#as_json' do
+        it 'renders to JSON with full links' do
+          expect(resource.as_json.links.first).to be_kind_of Hashie::Mash
         end
       end
 

data/spec/occi/parser/json_samples/test.json

@@ -5,6 +5,7 @@
             "attributes":{
                 "occi":{
                     "core":{
+                        "id": "34c88188-d31a-11e1-a11a-a4b197fffef4",
                         "summary":""
                     },
                     "compute":{
@@ -13,7 +14,21 @@
                     }
                 }
             },
-            "links":["/storagelink/34cbb948-d31a-11e1-a11a-a4b197fffef3"]
+            "links":[
+                {
+                    "kind":"http://schemas.ogf.org/occi/infrastructure#storagelink",
+                    "attributes":{
+                        "occi":{
+                            "core":{
+                                "id":"urn:uuid:34cbb948-d31a-11e1-a11a-a4b197fffef3",
+                                "title":"Harddisk 1",
+                                "source": "/compute/34c88188-d31a-11e1-a11a-a4b197fffef4",
+                                "target":"/storage/34c88188-d31a-11e1-a11a-a4b197fffef3"
+                            }
+                        }
+                    }
+                }
+            ]
         }
     ],
     "links":[
@@ -24,10 +39,11 @@
                     "core":{
                         "id":"urn:uuid:34cbb948-d31a-11e1-a11a-a4b197fffef3",
                         "title":"Harddisk 1",
+                        "source": "/compute/34c88188-d31a-11e1-a11a-a4b197fffef4",
                         "target":"/storage/34c88188-d31a-11e1-a11a-a4b197fffef3"
                     }
                 }
             }
         }
     ]
-}
+}

data/spec/spec_helper.rb

@@ -13,17 +13,6 @@ require 'json_spec'
 
 Dir["#{File.dirname(__FILE__)}/helpers/*.rb"].each {|file| require file }
 
-# simplify the usage of VCR; this will allow us to use
-#
-#   it "does something", :vcr do
-#     ...
-#   end
-#
-# instead of
-#
-#   it "does something else", :vcr => true do
-#     ...
-#   end
 RSpec.configure do |c|
   c.include JsonSpec::Helpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.17
+  version: 4.3.0
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
   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
@@ -74,20 +74,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
 description: OCCI is a collection of classes to simplify the implementation of the
   Open Cloud Computing API in Ruby
 email:
 - florian.feldhaus@gmail.com
 - piotr.kasprzak@gwdg.de
-- xparak@mail.muni.cz
+- parak@cesnet.cz
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -227,7 +227,7 @@ files:
 - spec/occi/parser/text_spec.rb
 - spec/occi/parser_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/gwdg/rOCCI-core
+homepage: https://github.com/EGI-FCTF/rOCCI-core
 licenses:
 - Apache License, Version 2.0
 metadata: {}