occi-core 4.0.0 → 4.0.1

data/README.md

@@ -9,55 +9,61 @@ rOCCI-core - A Ruby OCCI Framework
 Requirements
 ------------
 
-Ruby
+### Ruby
 * at least version 1.8.7 is required
-
-The following setup is recommended
-
-* Ruby 1.9.3+
+* Ruby 1.9.3+ is recommended
 * RubyGems installed
+* rake installed (e.g., `gem install rake`)
 
-The following libraries / packages may be required to use rOCCI
+### Libraries/packages
+* libxslt1-dev/libxslt-devel
+* libxml2-dev/libxml2-devel
+* **only if using Ruby 1.8.7:** libonig-dev/oniguruma-devel (Linux) or oniguruma (Mac)
 
-* libxslt-dev
-* libxml2-dev
-* **only if using Ruby 1.8.7:** libonig-dev (Linux) or oniguruma (Mac)
+### Examples
+For distros based on Debian:
+~~~
+apt-get install ruby rubygems ruby-dev libxslt1-dev libxml2-dev libonig-dev
+~~~
+
+For distros based on RHEL:
+~~~
+yum install libxml2-devel libxslt-devel ruby-devel openssl-devel gcc gcc-c++ ruby rubygems oniguruma-devel
+~~~
 
 Installation
 ------------
 
-**[Mac OS X has some special requirements for the installation. Detailed information can be found in
-doc/macosx.md.](doc/macosx.md)**
+### From RubyGems.org
 
 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
 
-### Installation from source
+### From source (dev)
+
+**Installation from source should never be your first choice! Especially, if you are not familiar with RVM, Bundler, Rake and other dev tools for Ruby!**
+**However, if you wish to contribute to our project, this is the right way to start.**
 
 To use rOCCI from source it is very much recommended to use RVM. [Install RVM](https://rvm.io/rvm/install/) with
 
     curl -L https://get.rvm.io | bash -s stable --ruby
-
-#### Ruby
+    rvm install 1.9.3
 
 To build and install the bleeding edge version from master
 
     git clone git://github.com/gwdg/rOCCI-core.git
     cd rOCCI-core
-    rvm install ruby-1.9.3
     gem install bundler
     bundle install
-    rake test
-
-Documentation
--------------
-
-[Code documentation can be found on RubyDoc.info](rubydoc.info/github/gwdg/rOCCI-core).
+    bundle exec rake test
+    rake install
 
 Usage
 -----

data/lib/occi/core/entity.rb

@@ -157,9 +157,10 @@ module Occi
       # @param [Occi::Model] model representation of the Occi model to check the attributes against
       def check
         raise "No model associated" unless @model
-        definitions = model.get_by_id(@kind.to_s).attributes
+        definitions = Occi::Core::Attributes.new
+        definitions.merge!(@model.get_by_id(@kind.to_s).attributes)
         @mixins.each do |mixin_id|
-          mixin = model.get_by_id(mixin_id)
+          mixin = @model.get_by_id(mixin_id)
           next if mixin.nil?
           definitions.merge!(mixin.attributes) if mixin.attributes
         end if @mixins

data/lib/occi/parser.rb

@@ -71,7 +71,8 @@ module Occi
         else
           nil
       end
-      locations
+
+      locations.flatten
     end
 
   end

data/lib/occi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json