restful_objects 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc457412078eadbb0d83af84afa695eb3abea02
-  data.tar.gz: 761377929fe4800901ee88b361cfe6b7e603a98e
+  metadata.gz: ab9347453b22d38c76c2ab4c8711d1c1bd825ea4
+  data.tar.gz: 85549e79dde2126e2871841d00d8ea64dfeced79
 SHA512:
-  metadata.gz: 197315bdd45d57a1dea3ab04593561893106582eb5b7bdbd8da84116b4abc992dbb1ffc2390b568ceb12ddf5f5d5afd2d585ea578bebc16485ae4adcea9edf6d
-  data.tar.gz: 8e73987857c84cababd5eaa857b67b38041d7f8691f9ae7826c09f5da2bd2d24065a4a3212af13860375d827cfac358d70b050405b109b0ef507f88378451243
+  metadata.gz: 935b685a0063195caa79387cb71c7cd51377c93de88dde3a285df92413a3c5289ef3586173d67da34a2e1ea41b840036de54e1a5f7bf90ea5b1efcb18703b3b7
+  data.tar.gz: d68969dfe27106b61abd847c742244e34160d498a1da0c44a6b0e34615aed0940edbd8c3cc3c53232e045f558384a285db4e15f44c10f32d80c712f17b516ee6

data/lib/restful_objects/domain_model/domain_model.rb

@@ -98,8 +98,9 @@ module RestfulObjects
     end
 
     def get_type_list_representation
-      { 'links'  => [link_to(:self, '/domain-types', :type_list), link_to(:up, '/', :homepage)],
-         'value' => @types.map { |name| link_to(:domain_type, "/domain-types/#{name}", :domain_type) }
+      {
+        'value' => @types.each_value.map { |type| link_to(:domain_type, "/domain-types/#{type.id}", :domain_type) },
+        'links'  => [link_to(:self, '/domain-types', :type_list), link_to(:up, '/', :homepage)]
       }.to_json
     end
 

data/lib/restful_objects/domain_model/mixins/object_base.rb

@@ -51,17 +51,19 @@ module RestfulObjects
 
     def representation(include_self_link = true)
       representation = {
+        'instanceId' => object_id.to_s,
+        'serviceId' => self.class.name,
         'title' => title,
         'members' => generate_members,
         'links' => [ link_to(:described_by, "/domain-types/#{self.class.name}", :domain_type) ],
         'extensions' => rs_type.metadata
       }
 
-      if not is_service
-        representation['instanceId'] = object_id.to_s
+      unless is_service
+        representation.delete('serviceId')
         representation['links'] << link_to(:self, "/objects/#{self.class.name}/#{object_id}", :object) if include_self_link
       else
-        representation['serviceId'] = self.class.name
+        representation.delete('instanceId')
         representation['links'] << link_to(:self, "/services/#{self.class.name}", :object) if include_self_link
       end
 

data/lib/restful_objects/domain_model/mixins/object_properties.rb

@@ -103,14 +103,18 @@ module RestfulObjects
 
     def set_property_value(property, value)
       if property_description(property).is_reference
-        href_value = value['href']
-        match = Regexp.new(".*/objects/(?<domain-type>\\w*)/(?<object-id>\\d*)").match(href_value)
-        raise "invalid property reference format: '#{href_value}'" if not match
-        domain_type = match['domain-type']
-        id = match['object-id'].to_i
-        raise "value does not exists" if not rs_model.objects.include?(id)
-        raise "domain-type does not exists" if not rs_model.types.include?(domain_type)
-        send "#{property}=".to_sym, rs_model.objects[id]
+        unless value.nil?
+          href_value = value['href']
+          match = Regexp.new(".*/objects/(?<domain-type>\\w*)/(?<object-id>\\d*)").match(href_value)
+          raise "invalid property reference format: '#{href_value}'" if not match
+          domain_type = match['domain-type']
+          id = match['object-id'].to_i
+          raise "value does not exists" if not rs_model.objects.include?(id)
+          raise "domain-type does not exists" if not rs_model.types.include?(domain_type)
+          send "#{property}=".to_sym, rs_model.objects[id]
+        else
+          send "#{property}=".to_sym, nil
+        end
       else
         send "#{property}=".to_sym, decode_value(value, property_type(property))
       end

data/lib/restful_objects/domain_model/types/action_description.rb

@@ -43,7 +43,7 @@ module RestfulObjects
             raise 'invalid return_type: object, proto_object or list key expected'
           end
           unless @result_type.is_a?(Class) or @result_type.is_a?(String)
-            raise 'return_type object, proto_object or list value should be a class or a string' 
+            raise 'return_type object, proto_object or list value should be a class or a string'
           end
         else
           raise 'invalid return_type: symbol or hash expected'
@@ -74,11 +74,13 @@ module RestfulObjects
     end
 
     def metadata
-      result = { 'friendlyName' => friendly_name,
-                 'description' => description,
-                 'returnType' => result_type,
-                 'hasParams' => has_params,
-                 'memberOrder' => member_order }
+      {
+        'friendlyName' => friendly_name,
+        'description'  => description,
+        'returnType'   => result_type,
+        'hasParams'    => has_params,
+        'memberOrder'  => member_order
+      }
     end
 
     def has_params

data/lib/restful_objects/domain_model/types/property_description.rb

@@ -32,22 +32,19 @@ module RestfulObjects
     end
 
     def get_representation
-      representation = {
-        'id' => @id,
-        'optional' => optional,
-        'memberOrder' => @member_order,
-        'links' => [
+      {
+        'id'           => @id,
+        'friendlyName' => friendly_name || '',
+        'description'  => description || '',
+        'optional'     => optional,
+        'memberOrder'  => @member_order,
+        'links'        => [
           link_to(:self, "/domain-types/#{@domain_type}/properties/#{@id}", :property_description),
           link_to(:up, "/domain-types/#{@domain_type}", :domain_type),
           link_to(:return_type, "/domain-types/#{@return_type}", :domain_type)
         ],
         'extensions' => {}
-      }
-
-      representation['friendlyName'] = friendly_name if friendly_name
-      representation['description'] = description if description
-
-      representation.to_json
+      }.to_json
     end
 
     def metadata

data/lib/restful_objects/router/domain_type_resources.rb

@@ -4,7 +4,7 @@ module RestfulObjects
       def self.registered(router)
         # D.21 Domain Types
         router.get "/domain-types" do
-          model.types.get_representation
+          model.get_type_list_representation
         end
 
         # D.22 Domain Type

data/lib/restful_objects/version.rb

@@ -1,3 +1,3 @@
 module RestfulObjects
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restful_objects
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Pablo Vizcay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler