restful_objects 0.0.2 → 0.0.3

data/lib/restful_objects/object_base.rb

@@ -79,6 +79,8 @@ module RestfulObjects
           value.to_s
         when :int
           value.to_i
+        when :bool
+          value.to_s
         when :decimal
           value.to_f
         when :date
@@ -97,6 +99,14 @@ module RestfulObjects
           value.to_s
         when :int
           value.to_i
+        when :bool
+          if value == 'true'
+            true
+          elsif value == 'false'
+            false
+          else
+            raise ArgumentError.new "invalid boolean value: #{value}"
+          end
         when :decimal
           Float(value)
         when :date

data/lib/restful_objects/object_collections.rb

@@ -1,84 +1,84 @@
-module RestfulObjects
-  module ObjectCollections
-    def collections_members
-      members = {}
-      rs_type.collections.each do |name, collection|
-        members[name] = {
-          'memberType' => 'collection',
-          'size' => rs_type.collections.count,
-          'links' => [
-            link_to(:details, "/objects/#{self.class.name}/#{object_id}/collections/#{name}", :object_collection, collection: name)
-          ],
-          'extensions' => collection.metadata
-        }
-      end
-      members
-    end
-
-    def get_collection_as_json(collection)
-      raise "collection not exists" if not rs_model.types[self.class.name].collections.include?(collection)
-
-      value = []
-      send(collection.to_sym).each do |object|
-        link = link_to(:value, "/objects/#{object.rs_type.id}/#{object.rs_instance_id}", :object, method: 'GET', collection: collection)
-        link['title'] = object.title
-        value << link
-      end
-
-      representation = {
-        'id' => collection,
-        'value' => value,
-        'links' => [
-            link_to(:self, "/objects/#{rs_type.id}/#{rs_instance_id}/collections/#{collection}", :object_collection),
-            link_to(:up, "/objects/#{rs_type.id}/#{rs_instance_id}", :object)
-          ],
-        'extensions' => rs_type.collections[collection].metadata
-      }
-
-      if not rs_model.types[self.class.name].collections[collection].read_only then
-        add_to_link = link_to(:add_to, "/objects/#{rs_type.id}/#{rs_instance_id}/collections/#{collection}",
-                              :object_collection, method: 'PUT', collection: collection)
-        add_to_link['arguments'] = { 'value' => nil }
-        remove_from_link = link_to(:remove_from, "/objects/#{rs_type.id}/#{rs_instance_id}/collections/#{collection}",
-                                   :object_collection, method: 'DELETE', collection: collection)
-        remove_from_link['arguments'] = { 'value' => nil }
-        representation['links'].concat [ add_to_link, remove_from_link ]
-      else
-        representation['disabledReason'] =
-          rs_model.types[self.class.name].collections[collection].disabled_reason
-      end
-
-      representation.to_json
-    end
-
-    def add_to_collection(collection, json)
-      raise "collection not exists" if not rs_model.types[self.class.name].collections.include?(collection)
-      href_value = JSON.parse(json)['value']['href']
-      match = Regexp.new(".*/objects/(?<domain-type>\\w*)/(?<object-id>\\d*)").match(href_value)
-      raise "Invalid request format" 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(collection.to_sym).push(rs_model.objects[id])
-
-      get_collection_as_json(collection)
-    end
-
-    def delete_from_collection(collection, json)
-      raise "collection not exists" if not rs_model.types[self.class.name].collections.include?(collection)
-      href_value = JSON.parse(json)['value']['href']
-      match = Regexp.new(".*/objects/(?<domain-type>\\w*)/(?<object-id>\\d*)").match(href_value)
-      raise "Invalid request format" 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(collection.to_sym).delete(rs_model.objects[id])
-
-      get_collection_as_json(collection)
-    end
-  end
-end
+module RestfulObjects
+  module ObjectCollections
+    def collections_members
+      members = {}
+      rs_type.collections.each do |name, collection|
+        members[name] = {
+          'memberType' => 'collection',
+          'size' => rs_type.collections.count,
+          'links' => [
+            link_to(:details, "/objects/#{self.class.name}/#{object_id}/collections/#{name}", :object_collection, collection: name)
+          ],
+          'extensions' => collection.metadata
+        }
+      end
+      members
+    end
+
+    def get_collection_as_json(collection)
+      raise "collection not exists" if not rs_model.types[self.class.name].collections.include?(collection)
+
+      value = []
+      send(collection.to_sym).each do |object|
+        link = link_to(:value, "/objects/#{object.rs_type.id}/#{object.rs_instance_id}", :object, method: 'GET', collection: collection)
+        link['title'] = object.title
+        value << link
+      end
+
+      representation = {
+        'id' => collection,
+        'value' => value,
+        'links' => [
+            link_to(:self, "/objects/#{rs_type.id}/#{rs_instance_id}/collections/#{collection}", :object_collection),
+            link_to(:up, "/objects/#{rs_type.id}/#{rs_instance_id}", :object)
+          ],
+        'extensions' => rs_type.collections[collection].metadata
+      }
+
+      if not rs_model.types[self.class.name].collections[collection].read_only then
+        add_to_link = link_to(:add_to, "/objects/#{rs_type.id}/#{rs_instance_id}/collections/#{collection}",
+                              :object_collection, method: 'PUT', collection: collection)
+        add_to_link['arguments'] = { 'value' => nil }
+        remove_from_link = link_to(:remove_from, "/objects/#{rs_type.id}/#{rs_instance_id}/collections/#{collection}",
+                                   :object_collection, method: 'DELETE', collection: collection)
+        remove_from_link['arguments'] = { 'value' => nil }
+        representation['links'].concat [ add_to_link, remove_from_link ]
+      else
+        representation['disabledReason'] =
+          rs_model.types[self.class.name].collections[collection].disabled_reason
+      end
+
+      representation.to_json
+    end
+
+    def add_to_collection(collection, json)
+      raise "collection not exists" if not rs_model.types[self.class.name].collections.include?(collection)
+      href_value = JSON.parse(json)['value']['href']
+      match = Regexp.new(".*/objects/(?<domain-type>\\w*)/(?<object-id>\\d*)").match(href_value)
+      raise "Invalid request format" 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(collection.to_sym).push(rs_model.objects[id])
+
+      get_collection_as_json(collection)
+    end
+
+    def delete_from_collection(collection, json)
+      raise "collection not exists" if not rs_model.types[self.class.name].collections.include?(collection)
+      href_value = JSON.parse(json)['value']['href']
+      match = Regexp.new(".*/objects/(?<domain-type>\\w*)/(?<object-id>\\d*)").match(href_value)
+      raise "Invalid request format" 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(collection.to_sym).delete(rs_model.objects[id])
+
+      get_collection_as_json(collection)
+    end
+  end
+end

data/lib/restful_objects/object_list.rb

@@ -1,16 +1,16 @@
-module RestfulObjects
-  class ObjectList
-    extend Forwardable
-
-    def initialize(base_url)
-      @objects = Hash.new
-      @base_url = base_url
-    end
-
-    def register(instance, service = false)
-      @objects[instance.object_id] = instance
-    end
-
-    def_delegators :@objects, :[], :each, :include?, :count, :clear, :empty?, :keys, :values
-  end
-end
+module RestfulObjects
+  class ObjectList
+    extend Forwardable
+
+    def initialize(base_url)
+      @objects = Hash.new
+      @base_url = base_url
+    end
+
+    def register(instance, service = false)
+      @objects[instance.object_id] = instance
+    end
+
+    def_delegators :@objects, :[], :each, :include?, :count, :clear, :empty?, :keys, :values
+  end
+end

data/lib/restful_objects/object_macros.rb

@@ -1,35 +1,35 @@
-module RestfulObjects
-  module ObjectMacros
-    def property(name, type, options = {})
-      RestfulObjects::DomainModel.current.types[self.name].properties.add(name.to_s, type, options)
-      if options[:read_only]
-        self.class_eval { attr_reader name }
-      else
-        if not options[:max_length]
-          self.class_eval { attr_accessor name }
-        else
-          self.class_eval do
-            attr_reader name
-
-            define_method "#{name}=".to_sym do |value|
-              raise "string max length exceeded" if value && value.length > options[:max_length]
-              instance_variable_set("@#{name}".to_sym, value)
-            end
-          end
-        end
-      end
-    end
-
-    def collection(name, type, options = {})
-      type = type.name if type.is_a? Class
-
-      RestfulObjects::DomainModel.current.types[self.name].collections.add(name.to_s, type, options)
-
-      self.class_eval { attr_reader name }
-    end
-
-    def action(name, result_type = :void, parameters = {}, options = {})
-      RestfulObjects::DomainModel.current.types[self.name].actions.add(name.to_s, result_type, parameters, options)
-    end
-  end
-end
+module RestfulObjects
+  module ObjectMacros
+    def property(name, type, options = {})
+      RestfulObjects::DomainModel.current.types[self.name].properties.add(name.to_s, type, options)
+      if options[:read_only]
+        self.class_eval { attr_reader name }
+      else
+        if not options[:max_length]
+          self.class_eval { attr_accessor name }
+        else
+          self.class_eval do
+            attr_reader name
+
+            define_method "#{name}=".to_sym do |value|
+              raise "string max length exceeded" if value && value.length > options[:max_length]
+              instance_variable_set("@#{name}".to_sym, value)
+            end
+          end
+        end
+      end
+    end
+
+    def collection(name, type, options = {})
+      type = type.name if type.is_a? Class
+
+      RestfulObjects::DomainModel.current.types[self.name].collections.add(name.to_s, type, options)
+
+      self.class_eval { attr_reader name }
+    end
+
+    def action(name, options = {})
+      RestfulObjects::DomainModel.current.types[self.name].actions.add(name.to_s, options)
+    end
+  end
+end

data/lib/restful_objects/object_properties.rb

@@ -1,78 +1,78 @@
-module RestfulObjects
-  module ObjectProperties
-    def properties_members
-      members = {}
-      rs_type.properties.each do |name, property|
-        members[name] = {
-          'memberType' => 'property',
-          'value' => get_property_value(name),
-          'links' => [
-            link_to(:details, "/objects/#{self.class.name}/#{object_id}/properties/#{name}", :object_property, property: name)
-          ],
-          'extensions' => property.metadata
-        }
-
-        members[name]['disabledReason'] = property.disabled_reason if property.read_only
-      end
-      members
-    end
-
-    def get_property_as_json(property)
-      raise "Property not exists" if not rs_model.types[self.class.name].properties.include?(property)
-
-      representation = {
-        property =>
-          { 'value' => get_property_value(property),
-            'links' => [
-              link_to(:self, "/objects/#{self.class.name}/#{object_id}/properties/#{property}", :object_property),
-              link_to(:up, "/objects/#{self.class.name}/#{object_id}", :object) ],
-            'extensions' => rs_model.types[self.class.name].properties[property].metadata
-          }
-      }
-
-      if not rs_model.types[self.class.name].properties[property].read_only then
-        representation[property]['links'].concat [
-          link_to(:modify, "/objects/#{self.class.name}/#{object_id}/properties/#{property}", :object_property,
-            { property: property, method: 'PUT', arguments: { 'value' => nil } }),
-          link_to(:clear, "/objects/#{self.class.name}/#{object_id}/properties/#{property}", :object_property,
-            { property: property, method: 'DELETE'} ) ]
-      else
-        representation[property]['disabledReason'] =
-          rs_model.types[self.class.name].properties[property].disabled_reason
-      end
-
-      representation.to_json
-    end
-
-    def put_property_as_json(property, json)
-      raise "property not exists" if not rs_model.types[self.class.name].properties.include?(property)
-      raise "read-only property" if rs_model.types[self.class.name].properties[property].read_only
-
-      value = JSON.parse(json)['value']
-      set_property_value(property, value)
-      on_after_update if respond_to? :on_after_update
-      get_property_as_json(property)
-    end
-
-    def clear_property(property)
-      raise "property not exists" if not rs_model.types[self.class.name].properties.include?(property)
-      raise "read-only property" if rs_model.types[self.class.name].properties[property].read_only
-
-      send("#{property}=".to_sym, nil)
-      on_after_update if respond_to? :on_after_update
-      get_property_as_json(property)
-    end
-
-    def property_type(property)
-      rs_model.types[self.class.name].properties[property].return_type
-    end
-
-    def get_property_value(property)
-      encode_value(send(property.to_sym), property_type(property))
-    end
-
-    def set_property_value(property, value)
-      send("#{property}=".to_sym, decode_value(value, property_type(property)))
-    end
-  end
-end
+module RestfulObjects
+  module ObjectProperties
+    def properties_members
+      members = {}
+      rs_type.properties.each do |name, property|
+        members[name] = {
+          'memberType' => 'property',
+          'value' => get_property_value(name),
+          'links' => [
+            link_to(:details, "/objects/#{self.class.name}/#{object_id}/properties/#{name}", :object_property, property: name)
+          ],
+          'extensions' => property.metadata
+        }
+
+        members[name]['disabledReason'] = property.disabled_reason if property.read_only
+      end
+      members
+    end
+
+    def get_property_as_json(property)
+      raise "Property not exists" if not rs_model.types[self.class.name].properties.include?(property)
+
+      representation = {
+        property =>
+          { 'value' => get_property_value(property),
+            'links' => [
+              link_to(:self, "/objects/#{self.class.name}/#{object_id}/properties/#{property}", :object_property),
+              link_to(:up, "/objects/#{self.class.name}/#{object_id}", :object) ],
+            'extensions' => rs_model.types[self.class.name].properties[property].metadata
+          }
+      }
+
+      if not rs_model.types[self.class.name].properties[property].read_only then
+        representation[property]['links'].concat [
+          link_to(:modify, "/objects/#{self.class.name}/#{object_id}/properties/#{property}", :object_property,
+            { property: property, method: 'PUT', arguments: { 'value' => nil } }),
+          link_to(:clear, "/objects/#{self.class.name}/#{object_id}/properties/#{property}", :object_property,
+            { property: property, method: 'DELETE'} ) ]
+      else
+        representation[property]['disabledReason'] =
+          rs_model.types[self.class.name].properties[property].disabled_reason
+      end
+
+      representation.to_json
+    end
+
+    def put_property_as_json(property, json)
+      raise "property not exists" if not rs_model.types[self.class.name].properties.include?(property)
+      raise "read-only property" if rs_model.types[self.class.name].properties[property].read_only
+
+      value = JSON.parse(json)['value']
+      set_property_value(property, value)
+      on_after_update if respond_to? :on_after_update
+      get_property_as_json(property)
+    end
+
+    def clear_property(property)
+      raise "property not exists" if not rs_model.types[self.class.name].properties.include?(property)
+      raise "read-only property" if rs_model.types[self.class.name].properties[property].read_only
+
+      send("#{property}=".to_sym, nil)
+      on_after_update if respond_to? :on_after_update
+      get_property_as_json(property)
+    end
+
+    def property_type(property)
+      rs_model.types[self.class.name].properties[property].return_type
+    end
+
+    def get_property_value(property)
+      encode_value(send(property.to_sym), property_type(property))
+    end
+
+    def set_property_value(property, value)
+      send("#{property}=".to_sym, decode_value(value, property_type(property)))
+    end
+  end
+end