occi 2.2.2 → 2.3.0

data/.yardopts

@@ -1 +1 @@
---title "Documentation of the OCCI gem" --markup markdown
+--title "Documentation of the OCCI gem" --markup markdown --private

data/Gemfile

@@ -4,7 +4,7 @@ source :rubygems
 gem "json"
 gem "antlr3"
 gem "hashie"
-gem "uuidtools"
+gem "uuidtools", ">=2.1.3"
 gem "nokogiri"
 gem "builder"
 gem "activesupport"

data/Gemfile.lock

@@ -31,7 +31,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    uuidtools (2.1.2)
+    uuidtools (2.1.3)
     yard (0.7.5)
     yard-sinatra (1.0.0)
       yard (~> 0.7)
@@ -51,6 +51,6 @@ DEPENDENCIES
   rspec
   rspec-http
   simplecov
-  uuidtools
+  uuidtools (>= 2.1.3)
   yard
   yard-sinatra

data/README.md

@@ -17,24 +17,11 @@ Installation
 
     gem install occi
 
-### Latest version
-
-Checkout latest version from GIT:
-
-    git clone git://github.com/gwdg/rOCCI.git
-
-Change to rOCCI folder
-
-    cd rOCCI
-
-Install dependencies for deployment
-
-    bundle install --deployment
-
 Usage
 -----
 
-First require the gem
+First require the gem, for Ruby 1.8.7 you also have to require rubygems
+    require 'rubygems'
     require 'occi'
 
 ### Client
@@ -43,7 +30,7 @@ The OCCI gem includes a Client to simplify the usage of an OCCI endpoint.
 
 To connect to an OCCI endpoint/server (e.g. running at http://localhost:3000/ ) use
 
-    client = OCCI::Client.new('http://localhost:3000')
+    client = OCCI::Client.new('http://occi.cloud.gwdg.de:3300')
 
 All available categories are automatically registered to the OCCI model during client initialization. You can get them via
 
@@ -112,11 +99,35 @@ the message header. As the text/plain and text/occi media type do not clearly di
 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 for example like
+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"|
-    OCCI::Parser.parse(media_type,body)
+    collection=OCCI::Parser.parse(media_type,body)
+
+### Parsing OVF / OVA files
+
+Parsing of OVF/OVA files is partly supported and will be improved in future versions.
+
+The example in [DMTF DSP 2021](http://www.dmtf.org/sites/default/files/standards/documents/DSP2021_1.0.0.tar) is
+bundled with rOCCI and can be parsed to an OCCI collection with
+
+    require 'open-uri'
+    ova=open 'https://raw.github.com/gwdg/rOCCI/master/spec/occi/test.ova'
+    collection=OCCI::Parser.ova(ova.read)
+
+Currently only the following entries of OVF files are parsed
+
+* File in References
+* Disk in the DiskSection
+* Network in the NetworkSection
+* in the VirutalSystemSection:
+** Info
+** in the VirtualHardwareSection the items regarding
+*** Processor
+*** Memory
+*** Ethernet Adapter
+*** Parallel port
 
 ### Using the OCCI model
 
@@ -125,6 +136,13 @@ The OCCI gem includes all OCCI Core classes necessary to handly arbitrary OCCI o
 Changelog
 ---------
 
+### Version 2.3
+
+* OCCI objects are now initialized with a list of attributes instead of a hash. Thus it is easier to check which
+attributes are expected by a class and helps prevent errors.
+* Parsing of a subset of the OVF specification is supported. Further parts of the specification will be covered in
+future versions of rOCCI.
+
 ### Version 2.2
 
 OCCI Client added. The client simplifies the execution of OCCI commands and provides shortcuts for often used steps.
@@ -144,6 +162,18 @@ Version 1.X of the OCCI gem has been developed by retr0h and served as a simple
 Development
 -----------
 
+Checkout latest version from GIT:
+
+    git clone git://github.com/gwdg/rOCCI.git
+
+Change to rOCCI folder
+
+    cd rOCCI
+
+Install dependencies for deployment
+
+    bundle install --deployment
+
 ### Code Documentation
 
 [Code Documentation for rOCCI by YARD](http://rubydoc.info/github/gwdg/rOCCI/)

data/lib/occi/client.rb

@@ -8,22 +8,15 @@ module OCCI
     headers 'Accept' => 'application/occi+json'
 
     attr_reader :endpoint
-
-    attr_reader :compute
-    attr_reader :storage
-    attr_reader :network
+    attr_reader :model
 
     def initialize(endpoint)
-      @endpoint  = endpoint
-      collection = OCCI::Collection.new(get_model)
-      OCCI::Model.register_collection(collection)
-      @compute = OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#compute')
-      @storage = OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#storage')
-      @network = OCCI::Model.get_by_id('http://schemas.ogf.org/occi/infrastructure#network')
+      @endpoint = endpoint
+      @model    = OCCI::Model.new(OCCI::Collection.new(get_model))
     end
 
     def get_model
-      self.class.get(endpoint + '/-/')
+      get(@endpoint + '/-/').body
     end
 
     def post_mixin
@@ -60,15 +53,15 @@ module OCCI
       resource.links      = []
       resources_to_link.each do |res|
         link = OCCI::Link.new
-        link.kind = 'http://schemas.ogf.org/occi/infrastructure#storagelink' if OCCI::Model.get_by_id(res.kind).related_to? 'http://schemas.ogf.org/occi/infrastructure#storage'
-        link.kind = 'http://schemas.ogf.org/occi/infrastructure#networkinterface' if OCCI::Model.get_by_id(res.kind).related_to? 'http://schemas.ogf.org/occi/infrastructure#network'
+        link.kind = 'http://schemas.ogf.org/occi/infrastructure#storagelink' if @model.get_by_id(res.kind).related_to? 'http://schemas.ogf.org/occi/infrastructure#storage'
+        link.kind = 'http://schemas.ogf.org/occi/infrastructure#networkinterface' if @model.get_by_id(res.kind).related_to? 'http://schemas.ogf.org/occi/infrastructure#network'
         link.titlte "Link to #{res.title}"
         link.target = res.location
         resource.links << link
       end
       resource.check
       collection = OCCI::Collection.new(:resources => [resource])
-      self.class.post(@endpoint + kind.location, { :body => collection.to_json, :headers => { 'Content-Type' => 'application/occi+json', 'Accept' => 'text/uri-list' }, :format => 'text/plain' }).to_s
+      self.class.post(@endpoint + kind.location, { :body => collection.to_json, :headers => { 'Content-Type' => 'application/occi+json', 'Accept' => 'text/uri-list' }, :format => 'text/plain' }).body
     end
 
     def delete_resources
@@ -84,7 +77,7 @@ module OCCI
 
 
     def get_compute_list
-      self.class.get(@endpoint + @compute.location, {:headers => { 'Accept' => 'text/uri-list' }, :format => 'text/plain'}).split("\n").compact
+      self.class.get(@endpoint + @compute.location, { :headers => { 'Accept' => 'text/uri-list' }, :format => 'text/plain' }).split("\n").compact
     end
 
     def get_compute_resources
@@ -148,7 +141,7 @@ module OCCI
     def get_attributes(categories)
       attributes = Hashie::Mash.new
       [categories].flatten.each do |category|
-        category = OCCI::Model.get_by_id(category) if category.kind_of? String
+        category = @model.get_by_id(category) if category.kind_of? String
         attributes.merge! category.attributes.combine_with_defaults
       end
       attributes
@@ -157,11 +150,55 @@ module OCCI
     def get_attribute_definitions(categories)
       definitions = OCCI::Core::AttributeProperties.new
       [categories].flatten.each do |category|
-        category = OCCI::Model.get_by_id(category) if category.kind_of? String
+        category = @model.get_by_id(category) if category.kind_of? String
         definitions.merge! category.attributes
       end
       definitions
     end
 
+    private
+
+    def get(path, collection=nil)
+      accept = head(path).headers['accept']
+      if accept.include? 'application/occi+json'
+        if collection
+          response = self.class.get(path, :body => collection.to_json)
+        else
+          response = self.class.get(path)
+        end
+        OCCI::Parser.parse(response.env['Content-Type'], response.body)
+      else
+        if collection
+          response = self.class.get(path, :headers => { 'Accept' => 'text/plain', 'Content-Type' => 'text/occi', 'Category ' => collection.categories.collect { |category| category.to_text }.join(','), 'X-OCCI-Attributes' => collection.entities.collect { |entity| entity.attributes.combine.collect { |k, v| k + '=' + v } }.join(',') })
+        else
+          response = self.class.get(path, :headers => { 'Accept' => 'text/plain' })
+        end
+        OCCI::Parser.parse(response.env['Content-Type'], response.body, true)
+      end
+    end
+
+    def post(path, collection)
+      accept = self.class.head(path).headers['accept']
+      if accept.include? 'application/occi+json'
+        self.class.post(path, :body => collection.to_json)
+      else
+        self.class.post(path, { :body => collection.to_text, :headers => { 'Accept' => 'text/plain', 'Content-Type' => 'text/plain' } })
+      end
+    end
+
+    def put(path, collection)
+      accept = self.class.head(path).headers['accept']
+      if accept.include? 'application/occi+json'
+        self.class.put(path, :body => collection.to_json)
+      else
+        self.class.put(path, { :body => collection.to_text, :headers => { 'Accept' => 'text/plain', 'Content-Type' => 'text/plain' } })
+      end
+    end
+
+    def delete(path, collection)
+      accept = self.class.head(path).headers['accept']
+      self.class.delete(path)
+    end
+
   end
 end

data/lib/occi/collection.rb

@@ -1,4 +1,5 @@
 require 'hashie/mash'
+require 'active_support/json'
 
 module OCCI
   class Collection
@@ -18,11 +19,11 @@ module OCCI
       @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
-      @resources = collection.resources.collect { |resource| OCCI::Core::Resource.new(resource) } if collection.resources.instance_of? Array
-      @links = collection.links { |link| OCCI::Core::Link.new(link) } if collection.links.instance_of? Array
+      @kinds = collection.kinds.collect { |kind| OCCI::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions) } if collection.kinds.instance_of? Array
+      @mixins = collection.mixins.collect { |mixin| OCCI::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.related, mixin.actions) } if collection.mixins.instance_of? Array
+      @actions = collection.actions.collect { |action| OCCI::Core::Action.new(action.scheme, action.term, action.title, action.attributes) } if collection.actions.instance_of? Array
+      @resources = collection.resources.collect { |resource| OCCI::Core::Resource.new(resource.kind, resource.mixins, resource.attributes, resource.links) } if collection.resources.instance_of? Array
+      @links = collection.links { |link| OCCI::Core::Link.new(link.kind, link.mixins, link.attributes) } if collection.links.instance_of? Array
     end
 
     # @return [Array] categories combined list of all kinds, mixins and actions
@@ -35,12 +36,29 @@ module OCCI
       @resources + @links
     end
 
+    # @return [true,false] true if collection is empty, false otherwise
     def empty?
       @kinds.empty? && @mixins.empty? && @actions.empty? && @resources.empty? && @links.empty?
     end
 
-    def to_json(options = { })
-      { :kinds => @kinds, :mixins => @mixins, :actions => @actions, :resources => @resources, :links => @links }.to_json
+    # @return [Hashie::Mash] returns collection as Hashie::Mash which can be converted to json
+    def as_json(options = { })
+      collection = Hashie::Mash.new
+      collection.kinds = @kinds.collect { |kind| kind.as_json } if @kinds.any?
+      collection.mixins = @mixins.collect { |mixin| mixin.as_json } if @mixins.any?
+      collection.actions = @actions.collect { |action| action.as_json } if @actions.any?
+      collection.resources = @resources.collect { |resource| resource.as_json } if @resources.any?
+      collection.links = @links.collect { |link| link.as_json } if @links.any?
+      collection
+    end
+
+    def to_text
+      body = ""
+      body << self.categories.collect { |category| category.to_text }.join("\n")
+      body << "\n" if self.categories.any?
+      raise "Only one entity allowed for rendering to plain text" if body.entities.size > 1
+      body << self.entities.collect {|entity| entity.to_text}.join("\n")
+      body
     end
 
   end

data/lib/occi/core/action.rb

@@ -3,6 +3,13 @@ require 'occi/core/category'
 module OCCI
   module Core
     class Action < OCCI::Core::Category
+
+      def to_text
+        text = super
+        text << ';attributes=' + @attributes.combine.join(' ').inspect if @attributes.any?
+        text
+      end
+
     end
   end
 end

data/lib/occi/core/attribute_properties.rb

@@ -23,7 +23,7 @@ module OCCI
             self[key].combine.each { |attr| array << key + '.' + attr }
           end
         end
-        return array
+        array
       end
 
       def combine_with_defaults
@@ -35,7 +35,7 @@ module OCCI
             self[key].combine_with_defaults.each { |k,v| hash[key + '.' + k] = v }
           end
         end
-        return hash
+        hash
       end
 
     end

data/lib/occi/core/attributes.rb

@@ -13,14 +13,14 @@ module OCCI
             hash[key] = self[key]
           end
         end
-        return hash
+        hash
       end
 
       def self.split(attributes)
         attribute = Attributes.new
         attributes.each do |name,value|
           puts name
-          key, dot, rest = name.partition('.')
+          key, _, rest = name.partition('.')
           if rest.empty?
             attribute[key] = value
           else

data/lib/occi/core/category.rb

@@ -1,41 +1,61 @@
-require 'json'
+require 'active_support/json'
+require 'active_support/inflector'
 require 'hashie/mash'
 
 module OCCI
   module Core
-    class Category < Hashie::Mash
+    class Category
 
-      def initialize(category=nil, default = nil)
-        category.attributes = OCCI::Core::AttributeProperties.new(category.attributes) if category
-        super(category, default)
-      end
+      attr_accessor :scheme, :term, :title, :attributes
 
-      def convert_value(val, duping=false) #:nodoc:
-        case val
-          when self.class
-            val.dup
-          when ::Hash
-            val = val.dup if duping
-            self.class.subkey_class.new.merge(val) unless val.kind_of?(Hashie::Mash)
-            val
-          when Array
-            val.collect { |e| convert_value(e) }
-          else
-            val
-        end
+      # @param [String ] scheme
+      # @param [String] term
+      # @param [String] title
+      # @param [OCCI::Core::AttributeProperties] attributes
+      def initialize(scheme, term, title=nil, attributes=nil)
+        @scheme     = scheme
+        @term       = term
+        @title      = title
+        @attributes = OCCI::Core::AttributeProperties.new(attributes)
       end
 
+      # @return [String] Type identifier of the category
       def type_identifier
-        regular_reader("scheme") + regular_reader("term")
+        @scheme + @term
+      end
+
+      # converts and adds supplied attributes to attributes of the category
+      # @param [Hash] attributes
+      # @return [OCCI::Core::AttributeProperties] attributes hash converted to attribute properties
+      def attributes=(attributes)
+        @attributes = OCCI::Core::AttributeProperties.new(attributes)
       end
 
-      def related_to?(category_id)
+      # check if category is related to another category
+      # @param [String] category_id Type identifier of a related category
+      # @return [true,false] true if category is related to category_id else false
+      def related_to?(category_id, model)
         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
+          return true if rel_id == category_id || model.get_by_id(rel_id).related_to?(category_id, model)
+        end if self.class.method_defined? 'related'
         false
       end
 
+      def as_json(options={ })
+        category = Hashie::Mash.new
+        category.scheme = @scheme if @scheme
+        category.term = @term if @term
+        category.title = @title if @title
+        category.attributes = @attributes if @attributes.any?
+        category
+      end
+
+      def to_text
+        text = @term + ';scheme=' + @scheme.inspect + ';class=' + self.class.name.demodulize.downcase.inspect
+        text << ';title=' + @title.inspect if @title
+        text
+      end
+
     end
   end
 end

data/lib/occi/core/entity.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'uuidtools'
 require 'hashie/mash'
+require 'active_support/json'
 require 'occi/model'
 require 'occi/core/attributes'
 require 'occi/core/kind'
@@ -8,90 +9,89 @@ require 'occi/core/attribute_properties'
 
 module OCCI
   module Core
-    class Entity < Hashie::Mash
-
-      # Define appropriate kind
-      def self.register
-        data = Hashie::Mash.new
-        data[:term] = "entity"
-        data[:scheme] = "http://schemas.ogf.org/occi/core#"
-        data[:title] = "Entity"
-        data.attributes!.occi!.core!.id!.type = "string"
-        data.attributes!.occi!.core!.id!.pattern = "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"
-        data.attributes!.occi!.core!.id!.required = false
-        data.attributes!.occi!.core!.id!.mutable = false
-        data.attributes!.occi!.core!.title!.type = "string"
-        data.attributes!.occi!.core!.title!.pattern = ".*"
-        data.attributes!.occi!.core!.title!.required = false
-        data.attributes!.occi!.core!.title!.mutable = true
-
-        kind = OCCI::Core::Kind.new(data)
-        OCCI::Model.register(kind)
-      end
+    class Entity
 
-      def initialize(entity=nil, default = nil)
-        super(entity, default)
-        self.check
-      end
+      attr_accessor :kind, :mixins, :attributes
 
-      def id
-        self[:id] ||= self.attributes!.occi!.core!.id if self.attributes!.occi!.core
-        return self[:id]
-      end
+      # @return [OCCI::Core::Kind] kind definition of Entity type
+      def self.kind_definition
+        kind = OCCI::Core::Kind.new('http://schemas.ogf.org/occi/core#', 'entity')
 
-      def id=(id)
-        self[:id] = id
-        self.attributes ||= OCCI::Core::Attributes.new
-        self.attributes!.occi!.core!.id = id
+        kind.title = "Entity"
+
+        kind.attributes.occi!.core!.id!.type     = "string"
+        kind.attributes.occi!.core!.id!.pattern  = "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"
+        kind.attributes.occi!.core!.id!.required = false
+        kind.attributes.occi!.core!.id!.mutable  = false
+
+        kind.attributes.occi!.core!.title!.type     = "string"
+        kind.attributes.occi!.core!.title!.pattern  = ".*"
+        kind.attributes.occi!.core!.title!.required = false
+        kind.attributes.occi!.core!.title!.mutable  = true
+
+        kind
       end
 
-      def title
-        self[:title] ||= self.attributes!.occi!.core!.title  if self.attributes!.occi!.core
-        return self[:title]
+      # @param [String] kind
+      # @param [String] mixins
+      # @param [OCCI::Core::Attributes] attributes
+      def initialize(kind, mixins=nil, attributes=nil)
+        @kind       = kind
+        @mixins     = mixins.to_a
+        @attributes = OCCI::Core::Attributes.new(attributes)
+        self.id = UUIDTools::UUID.timestamp_create.to_s
       end
 
-      def title=(title)
-        self[:title] = title
-        self.attributes ||= OCCI::Core::Attributes.new
-        self.attributes!.occi!.core!.title = title
+      # set id for entity
+      # @param [UUIDTools::UUID] id
+      def id=(id)
+        @attributes.occi!.core!.id = id
       end
 
-      def location
-        '/' + OCCI::Model.get_by_id(self.kind).term + '/' + self.id if self.kind
+      # @return [UUIDTools::UUID] id of the entity
+      def id
+        @attributes.occi!.core!.id
       end
 
-      def type_identifier
-        OCCI::Model.get_by_id(self.kind).type_identifier
+      # @return [String] location of the entity
+      def location
+        '/' + @kind.split('#').last + '/' + @attributes.occi!.core!.id
       end
 
-      def check
-        definitions = OCCI::Model.get_by_id(self.kind).attributes if self.kind
-        self.mixins.each do |mixin_id|
-          mixin = OCCI::Model.get_by_id(mixin_id)
+      # check attributes against their definitions and set defaults
+      # @param [OCCI::Model] model representation of the OCCI model to check the attributes against
+      def check(model)
+        raise "No kind defined" unless @kind
+        definitions = model.get_by_id(@kind).attributes
+        @mixins.each do |mixin_id|
+          mixin = model.get_by_id(mixin_id)
           next if mixin.nil?
           definitions.merge!(mixin.attributes) if mixin.attributes
-        end if self.mixins
+        end if @mixins
 
-        self.attributes = Entity.check(self.attributes, definitions) if definitions
+        @attributes = Entity.check(@attributes, definitions) if definitions
       end
 
+      # @param [OCCI::Core::Attributes] attributes
+      # @param [OCCI::Core::AttributeProperties] definitions
+      # @return [OCCI::Core::Attributes] attributes with their defaults set
       def self.check(attributes, definitions)
         attributes = OCCI::Core::Attributes.new(attributes)
         definitions.each_key do |key|
           properties = definitions[key]
-          value = attributes[key] ||= properties[:default]
+          value      = attributes[key] ||= properties[:default]
           if properties.include?(:type)
             raise "required attribute #{key} not found" if value.nil? && properties.required
             next if value.nil? && !properties.required
             case properties.type
-              when 'string'
-                raise "attribute #{key} with value #{value} from class #{value.class.name} does not match attribute property type #{properties.type}" unless value.kind_of?(String)
-                raise "attribute #{key} with length #{value.length} not in range #{properties.minimum}-#{properties.maximum}" unless (properties.minimum..properties.maximum) === value.length if properties.minimum && properties.maximum
               when 'number'
                 raise "attribute #{key} value #{value} from class #{value.class.name} does not match attribute property type #{properties.type}" unless value.kind_of?(Numeric)
                 raise "attribute #{key} with value #{value} not in range #{properties.minimum}-#{properties.maximum}" unless (properties.minimum..properties.maximum) === value if properties.minimum && properties.maximum
               when 'boolean'
                 raise "attribute #{key} value #{value} from class #{value.class.name} does not match attribute property type #{properties.type}" unless !!value == value
+              else
+                raise "attribute #{key} with value #{value} from class #{value.class.name} does not match attribute property type #{properties.type}" unless value.kind_of?(String)
+                raise "attribute #{key} with length #{value.length} not in range #{properties.minimum}-#{properties.maximum}" unless (properties.minimum..properties.maximum) === value.length if properties.minimum && properties.maximum
             end
             raise "attribute #{key} with value #{value} does not match pattern #{properties.pattern}" if value.to_s.scan(Regexp.new(properties.pattern)).empty? if properties.pattern
             attributes[key] = value
@@ -99,23 +99,18 @@ module OCCI
             attributes[key] = check(value, definitions[key])
           end
         end
-        attributes.delete_if { |k, v| v.nil? } # remove empty attributes
+        attributes.delete_if { |_, v| v.nil? } # remove empty attributes
         return attributes
       end
 
-      def convert_value(val, duping=false) #:nodoc:
-        case val
-          when self.class
-            val.dup
-          when ::Hash
-            val = val.dup if duping
-            self.class.subkey_class.new.merge(val) unless val.kind_of?(Hashie::Mash)
-            val
-          when Array
-            val.collect { |e| convert_value(e) }
-          else
-            val
-        end
+      # @param [Hash] options
+      # @return [Hashie::Mash] entity as Hashie::Mash to be parsed into a JSON object
+      def as_json(options={ })
+        entity = Hashie::Mash.new
+        entity.kind = @kind if @kind
+        entity.mixins = @mixins if @mixins.any?
+        entity.attributes = @attributes if @attributes.any?
+        entity
       end
 
     end