occi 2.0.6 → 2.1.0

data/occi.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json'
   gem.add_dependency 'antlr3'
   gem.add_dependency 'hashie'
+  gem.add_dependency 'uuidtools'
+  gem.add_dependency 'nokogiri'
+  gem.add_dependency 'activesupport'
 
   gem.required_ruby_version     = ">= 1.8.7"
 end

data/spec/occi/collection_spec.rb

@@ -0,0 +1,19 @@
+require 'rspec'
+require 'occi'
+
+module OCCI
+  describe Collection do
+    describe "initialize" do
+
+      it "should create a new OCCI collection including the OCCI base objects" do
+        collection = Hashie::Mash.new(:kinds => [], :mixins => [], :actions => [], :resources => [], :links => [])
+        collection.kinds << { :term => "compute", :scheme => "http://schemas.ogf.org/occi/infrastructure#" }
+        collection.mixins << { :term => "my_mixin", :scheme => "http://example.com/occi/tags#" }
+        collection.actions << { :term => "start", :scheme => "http://schemas.ogf.org/occi/infrastructure/compute/action#" }
+        collection.resources << { :kind => "http://schemas.ogf.org/occi/infrastructure#compute" }
+        collection.links << { :kind => "http://schemas.ogf.org/occi/infrastructure#storagelink" }
+      end
+
+    end
+  end
+end

data/spec/occi/log_spec.rb

@@ -0,0 +1,16 @@
+require "rspec"
+require 'occi/log'
+
+module OCCI
+  describe Log do
+
+    describe "log messages" do
+      it "should log a message to a pipe" do
+        r, w = IO.pipe
+        OCCI::Log.new(w, OCCI::Log::INFO)
+        OCCI::Log.info("Test")
+        r.readline.include?("Test")
+      end
+    end
+  end
+end

data/spec/occi/model_spec.rb

@@ -0,0 +1,26 @@
+require "rspec"
+require 'occi/model'
+
+describe "Model" do
+
+  it "initializes Core Model successfully" do
+    OCCI::Model.register_core
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/core#entity').should be_kind_of OCCI::Core::Kind
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/core#resource').should be_kind_of OCCI::Core::Kind
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/core#link').should be_kind_of OCCI::Core::Kind
+  end
+
+  it "initializes Infrastructure Model successfully" do
+    OCCI::Model.register_files('etc/model/infrastructure/')
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#compute').should be_kind_of OCCI::Core::Kind
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#os_tpl').should be_kind_of OCCI::Core::Mixin
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#resource_tpl').should be_kind_of OCCI::Core::Mixin
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#network').should be_kind_of OCCI::Core::Kind
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure/network#ipnetwork').should be_kind_of OCCI::Core::Mixin
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#networkinterface').should be_kind_of OCCI::Core::Kind
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure/networkinterface#ipnetworkinterface').should be_kind_of OCCI::Core::Mixin
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storage').should be_kind_of OCCI::Core::Kind
+    OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storagelink').should be_kind_of OCCI::Core::Kind
+  end
+
+end

data/spec/occi/parser_spec.rb

@@ -0,0 +1,12 @@
+require "rspec"
+require 'occi/parser'
+
+describe "Parser" do
+
+  it "should parse OCCI message with entity in text plain format" do
+    media_type = 'text/plain'
+    body = %Q|Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind"\nX-OCCI-Attribute: occi.compute.cores=2|
+    category = false
+    OCCI::Parser.parse(media_type,body,category)
+  end
+end

data/spec/occiantlr/parser_spec.rb

@@ -0,0 +1,84 @@
+require 'rspec'
+require 'hashie'
+
+require 'occiantlr/OCCIANTLRParser'
+
+module OCCI
+  module ANTLR
+    describe Parser do
+      describe "#Category" do
+        it "is parsed successful" do
+          ATTRIBUTE                       = { :mutable => true, :required => false, :type => "string" }
+          term                            = 'entity'
+          scheme                          = 'http://schemas.ogf.org/occi/core#'
+          class_type                      = 'kind'
+          title                           = 'Storage Resource How\'s your quotes escaping?\"'
+          rel                             = 'http://schemas.ogf.org/occi/core#resource'
+          location                        = '/storage/'
+          attributes                      = Hashie::Mash.new
+          attributes.occi!.storage!.size  = ATTRIBUTE
+          attributes.occi!.storage!.state = ATTRIBUTE
+          attributes_string               = 'occi.storage.size occi.storage.state'
+          actions                         = Array.new
+          actions << 'http://schemas.ogf.org/occi/infrastructure/storage/action#resize'
+          actions << 'http://schemas.ogf.org/occi/infrastructure/storage/action#online'
+
+          category_string = %Q{Category: #{term}; scheme="#{scheme}"; class="#{class_type}"; title="#{title}"; rel="#{rel}"; location="#{location}"; attributes="#{attributes_string}"; actions="#{actions.join(' ')}"}
+
+          category = OCCIANTLR::Parser.new(category_string).category
+          kind     = category[:kinds].first
+          kind[:term].should == term
+          kind[:scheme].should == scheme
+          kind[:title].should == title
+          kind[:related].should == rel
+          kind[:location].should == location
+          kind[:attributes].should == attributes
+          kind[:actions].should == actions
+        end
+      end
+
+      describe "#Link" do
+        it "is parsed successful" do
+          target                                       = '/network/123'
+          rel                                          = 'http://schemas.ogf.org/occi/infrastructure#network'
+          self_location                                = '/link/networkinterface/456'
+          category                                     = 'http://schemas.ogf.org/occi/infrastructure#networkinterface'
+          attributes                                   = Hashie::Mash.new
+          attributes.occi!.networkinterface!.interface = '"eth0"'
+          attributes.occi!.networkinterface!.mac       = '"00:11:22:33:44:55"'
+          attributes.occi!.networkinterface!.state     = '"active"'
+          attributes_string                            = %Q{occi.networkinterface.interface="eth0";occi.networkinterface.mac="00:11:22:33:44:55";occi.networkinterface.state="active"}
+          link_string                                  = %Q{Link: <#{target}>; rel="#{rel}"; self="#{self_location}"; category="#{category}"; #{attributes_string}}
+
+          link = OCCIANTLR::Parser.new(link_string).link
+          link[:target].should == target
+          link[:rel].should == rel
+          link[:self].should == self_location
+          link[:category].should == category
+          link[:attributes].should == attributes
+        end
+      end
+
+      describe "#X-OCCI-Attribute" do
+        it "is parsed successful" do
+          attribute                             = Hashie::Mash.new
+          attribute.occi!.compute!.architecture = '"x86_64"'
+
+          x_occi_attributes_string = %Q{X-OCCI-Attribute: occi.compute.architecture="x86_64"}
+
+          x_occi_attribute = OCCIANTLR::Parser.new(x_occi_attributes_string).x_occi_attribute
+          x_occi_attribute.should == attribute
+        end
+      end
+
+      describe "#X-OCCI-Location" do
+        it "is parsed successful" do
+          location        = URI.parse('http://example.com/compute/123')
+          location_string = %Q{X-OCCI-Location: #{location.to_s}}
+          x_occi_location = OCCIANTLR::Parser.new(location_string).x_occi_location
+          x_occi_location.should == location
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -60,6 +60,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
   Open Cloud Computing API in Ruby
 email:
@@ -80,30 +128,42 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- etc/model/infrastructure/compute.json
+- etc/model/infrastructure/ipnetwork.json
+- etc/model/infrastructure/ipnetworkinterface.json
+- etc/model/infrastructure/network.json
+- etc/model/infrastructure/networkinterface.json
+- etc/model/infrastructure/os_template.json
+- etc/model/infrastructure/resource_template.json
+- etc/model/infrastructure/storage.json
+- etc/model/infrastructure/storagelink.json
 - lib/occi.rb
-- lib/occi/antlr/.gitignore
-- lib/occi/antlr/OCCI.g
-- lib/occi/antlr/OCCI.tokens
-- lib/occi/antlr/OCCILexer.rb
-- lib/occi/antlr/OCCIParser.rb
-- lib/occi/antlr/README.md
+- lib/occi/collection.rb
 - lib/occi/core/action.rb
 - lib/occi/core/attribute_properties.rb
 - lib/occi/core/attributes.rb
 - lib/occi/core/category.rb
-- lib/occi/core/collection.rb
 - lib/occi/core/entity.rb
 - lib/occi/core/kind.rb
 - lib/occi/core/link.rb
 - lib/occi/core/mixin.rb
 - lib/occi/core/resource.rb
-- lib/occi/exceptions.rb
 - lib/occi/log.rb
-- lib/occi/parse.rb
-- lib/occi/registry.rb
+- lib/occi/model.rb
+- lib/occi/parser.rb
 - lib/occi/version.rb
+- lib/occiantlr/.gitignore
+- lib/occiantlr/OCCIANTLR.g
+- lib/occiantlr/OCCIANTLR.tokens
+- lib/occiantlr/OCCIANTLRLexer.rb
+- lib/occiantlr/OCCIANTLRParser.rb
+- lib/occiantlr/README.md
 - occi.gemspec
-- spec/occi/antlr/parser_spec.rb
+- spec/occi/collection_spec.rb
+- spec/occi/log_spec.rb
+- spec/occi/model_spec.rb
+- spec/occi/parser_spec.rb
+- spec/occiantlr/parser_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gwdg/occi
 licenses: []
@@ -130,6 +190,10 @@ signing_key:
 specification_version: 3
 summary: OCCI toolkit
 test_files:
-- spec/occi/antlr/parser_spec.rb
+- spec/occi/collection_spec.rb
+- spec/occi/log_spec.rb
+- spec/occi/model_spec.rb
+- spec/occi/parser_spec.rb
+- spec/occiantlr/parser_spec.rb
 - spec/spec_helper.rb
 has_rdoc: