occi 2.1.0 → 2.1.1

data/Gemfile

@@ -8,6 +8,7 @@ gem "uuidtools"
 gem "nokogiri"
 gem "builder"
 gem "activesupport"
+gem "rake"
 
 # development related gems
 group :development do

data/Gemfile.lock

@@ -11,6 +11,8 @@ GEM
     i18n (0.6.0)
     json (1.6.6)
     multi_json (1.3.5)
+    nokogiri (1.5.3)
+    rake (0.9.2.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -40,6 +42,7 @@ DEPENDENCIES
   hashie
   json
   nokogiri
+  rake
   rspec
   rspec-http
   simplecov

data/README.md

@@ -42,10 +42,13 @@ First require the gem
 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.
+
     OCCI::Log.new(STDOUT,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
@@ -53,6 +56,7 @@ You can always, even if there is no logger defined, log output using the class m
 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:
+
     OCCI::Model.register_core
     OCCI::Model.register_infrastructure
 
@@ -68,11 +72,10 @@ category and a message with an entity which has a kind, it has to be specified i
 .g. for user defined mixins)
 
 OCCI messages can be parsed for example like
+
     media_type = text/plain
     body = %Q|Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind"|
-    header = {}
-    category = false
-    OCCI::Parser.parse(media_type,body,header,category)
+    OCCI::Parser.parse(media_type,body)
 
 ### Using the OCCI model
 

data/lib/occi/collection.rb

@@ -13,7 +13,11 @@ module OCCI
     # @param [Hash] collection including one or more of the keys kinds, mixins, actions, resources, links
     def initialize(collection={ })
       collection = Hashie::Mash.new(collection)
-      @kinds     = @mixins = @actions = @resources = @links = []
+      @kinds     = []
+      @mixins    = []
+      @actions   = []
+      @resources = []
+      @links     = []
       @kinds = collection.kinds.collect { |kind| OCCI::Core::Kind.new(kind) } if collection.kinds.instance_of? Array
       @mixins = collection.mixins.collect { |mixin| OCCI::Core::Mixin.new(mixin) } if collection.mixins.instance_of? Array
       @actions = collection.actions.collect { |action| OCCI::Core::Action.new(action) } if collection.actions.instance_of? Array

data/lib/occi/core/attribute_properties.rb

@@ -17,8 +17,6 @@ module OCCI
       def combine
         array = []
         self.each_key do |key|
-          puts key
-          puts self[key]
           if self[key].include? 'type'
             array << key + "{}"
           else

data/lib/occi/core/category.rb

@@ -30,8 +30,8 @@ module OCCI
       end
 
       def related_to?(category_id)
-        self.related.each do |category|
-          return true if category.type_identifier == category_id || category.related_to?(category_id)
+        self.related.each do |rel_id|
+          return true if rel_id == category_id || OCCI::Model.get_by_id(rel_id).related_to?(category_id)
         end if self.related
         false
       end

data/lib/occi/core/entity.rb

@@ -41,6 +41,7 @@ module OCCI
 
       def id=(id)
         self[:id] = id
+        self.attributes ||= OCCI::Core::Attributes.new
         self.attributes!.occi!.core!.id = id
       end
 
@@ -51,6 +52,7 @@ module OCCI
 
       def title=(title)
         self[:title] = title
+        self.attributes ||= OCCI::Core::Attributes.new
         self.attributes!.occi!.core!.title = title
       end
 
@@ -64,7 +66,12 @@ module OCCI
 
       def check
         definitions = OCCI::Model.get_by_id(self.kind).attributes if self.kind
-        self.mixins.each { |mixin| definitions.merge!(OCCI::Model.get_by_id(mixin).attributes) if OCCI::Model.get_by_id(mixin).attributes } if self.mixins
+        self.mixins.each do |mixin_id|
+          mixin = OCCI::Model.get_by_id(mixin_id)
+          next if mixin.nil?
+          definitions.merge!(mixin.attributes) if mixin.attributes
+        end if self.mixins
+
         self.attributes = Entity.check(self.attributes, definitions) if definitions
       end
 

data/lib/occi/core/resource.rb

@@ -30,6 +30,7 @@ module OCCI
 
       def summary=(summary)
         self[:summary] = summary
+        self.attributes ||= OCCI::Core::Attributes.new
         self.attributes!.occi!.core!.summary = summary
       end
 

data/lib/occi/model.rb

@@ -24,14 +24,15 @@ module OCCI
     #
     # @param [String] path to a folder containing files which include OCCI collections in JSON format. The path is
     #  recursively searched for files with the extension .json .
-    def self.register_files(path)
+    # @param [Sting] scheme_base_url base location for provider specific extensions of the OCCI model
+    def self.register_files(path, scheme_base_url='http://localhost')
       OCCI::Log.info("### Initializing OCCI Model from #{path} ###")
       Dir.glob(path + '/**/*.json').each do |file|
         collection = OCCI::Collection.new(JSON.parse(File.read(file)))
         # add location of service provider to scheme if it has a relative location
-        collection.kinds.collect { |kind| kind.scheme = self.location + kind.scheme if kind.scheme.start_with? '/' } if collection.kinds
-        collection.mixins.collect { |mixin| mixin.scheme = self.location + mixin.scheme if mixin.scheme.start_with? '/' } if collection.mixins
-        collection.actions.collect { |action| action.scheme = self.location + action.scheme if action.scheme.start_with? '/' } if collection.actions
+        collection.kinds.collect { |kind| kind.scheme = scheme_base_url + kind.scheme if kind.scheme.start_with? '/' } if collection.kinds
+        collection.mixins.collect { |mixin| mixin.scheme = scheme_base_url + mixin.scheme if mixin.scheme.start_with? '/' } if collection.mixins
+        collection.actions.collect { |action| action.scheme = scheme_base_url + action.scheme if action.scheme.start_with? '/' } if collection.actions
         self.register_collection(collection)
       end
     end
@@ -82,12 +83,6 @@ module OCCI
     # @return [Hashie::Mash] collection
     def self.get(filter = [])
       collection = Hashie::Mash.new({ :kinds => [], :mixins => [], :actions => [] })
-      filter.each do |cat|
-        category = get_by_id(cat.type_identifier)
-        collection.kinds << category if category.kind_of?(OCCI::Core::Kind)
-        collection.mixins << category if category.kind_of?(OCCI::Core::Mixin)
-        collection.actions << category if category.kind_of?(OCCI::Core::Action)
-      end
       if filter.empty?
         @@categories.each_value do |category|
           collection.kinds << category if category.kind_of? OCCI::Core::Kind
@@ -95,6 +90,15 @@ module OCCI
           collection.actions << category if category.kind_of? OCCI::Core::Action
         end
       end
+      OCCI::Log.debug("### Filtering categories #{filter.collect{|c| c.type_identifier}.inspect}")
+      while filter.any? do
+        cat = filter.pop
+        filter.concat @@categories.each_value.select { |category| category.related_to?(cat.type_identifier) }
+        category = get_by_id(cat.type_identifier)
+        collection.kinds << category if category.kind_of?(OCCI::Core::Kind)
+        collection.mixins << category if category.kind_of?(OCCI::Core::Mixin)
+        collection.actions << category if category.kind_of?(OCCI::Core::Action)
+      end
       return collection
     end
 

data/lib/occi/parser.rb

@@ -39,15 +39,15 @@ module OCCI
     # @param [String] body the body of the OCCI message
     # @param [true, false] category for text/plain and text/occi media types information e.g. from the HTTP request location is needed to determine if the OCCI message includes a category or an entity
     # @param [Hash] header optional header of the OCCI message
-    # @return [Array<Array, OCCI::Core::Collection>] list consisting of an array of locations and the OCCI object collection
+    # @return [Array<Array, OCCI::Collection>] list consisting of an array of locations and the OCCI object collection
     def self.parse(media_type, body, category=false, header={ })
       OCCI::Log.debug('### Parsing request data to OCCI data structure ###')
       collection = OCCI::Collection.new
-      # always check header for locations
-      locations  = self.header_locations(header)
-      category ? collection = self.header_categories(header) : collection = self.header_entity(header) if locations.empty?
 
       case media_type
+        when 'text/occi'
+          locations  = self.header_locations(header)
+          category ? collection = self.header_categories(header) : collection = self.header_entity(header) if locations.empty?
         when 'text/uri-list'
           body.each_line { |line| locations << URI.parse(line) }
         when 'text/plain', nil
@@ -60,7 +60,7 @@ module OCCI
         #when 'application/ovf+xml'
         #  collection = self.ovf(body)
         else
-          raise OCCI::ContentTypeNotSupported
+          raise "Content Type not supported"
       end
       return locations, collection
     end
@@ -73,7 +73,7 @@ module OCCI
     end
 
     def self.header_categories(header)
-      collection       = OCCI::Core::Collection.new
+      collection       = OCCI::Collection.new
       category_strings = header['HTTP_CATEGORY'].to_s.split(',')
       category_strings.each do |cat|
         category = OCCIANTLR::Parser.new('Category: ' + cat).category
@@ -116,9 +116,10 @@ module OCCI
     end
 
     def self.text_categories(text)
-      collection = OCCI::Core::Collection.new
+      collection = OCCI::Collection.new
       text.each_line do |line|
         category = OCCIANTLR::Parser.new(line).category
+        next if category.nil?
         collection.kinds.concat category.kinds.collect { |kind| OCCI::Core::Kind.new(kind) }
         collection.mixins.concat category.mixins.collect { |mixin| OCCI::Core::Mixin.new(mixin) }
         collection.actions.concat category.actions.collect { |action| OCCI::Core::Action.new(action) }
@@ -153,7 +154,7 @@ module OCCI
     end
 
     def self.json(json)
-      collection = OCCI::Core::Collection.new
+      collection = OCCI::Collection.new
       hash       = Hashie::Mash.new(JSON.parse(json))
       collection.kinds.concat hash.kinds.collect { |kind| OCCI::Core::Kind.new(kind) } if hash.kinds
       collection.mixins.concat hash.mixins.collect { |mixin| OCCI::Core::Mixin.new(mixin) } if hash.mixins

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json