ooor 1.0.9 → 1.1.0

data/lib/app/models/open_object_resource.rb

@@ -220,39 +220,52 @@ class OpenObjectResource < ActiveResource::Base
     @attributes.each {|k, v| @attributes[k] = ((v.is_a? BigDecimal) ? Float(v) : v)}
   end
 
-  def load(attributes)
+  def reload_from_record!(record)
+    load(record.attributes, record.relations)
+  end
+
+  def load(attributes, relations={})
     self.class.reload_fields_definition unless self.class.field_defined
     raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
     @prefix_options, attributes = split_options(attributes)
-    @relations = {}
+    @relations = relations
     @loaded_relations = {}
     attributes.each do |key, value|
-      case value
-        when Array
-           relations[key.to_s] = value #the relation because we want the method to load the association through method missing
-        when Hash
-          resource = find_or_create_resource_for(key) #TODO check!
-          @attributes[key.to_s] = resource@attributes[key.to_s].new(value)
-        else
-          @attributes[key.to_s] = value.dup rescue value
+      skey = key.to_s
+      if self.class.many2one_relations.has_key?(skey) || self.class.one2many_relations.has_key?(skey) || self.class.many2many_relations.has_key?(skey)
+        relations[skey] = value #the relation because we want the method to load the association through method missing
+      else
+        case value
+          when self.class.many2one_relations.has_key?(skey) || self.class.one2many_relations.has_key?(skey) || self.class.many2many_relations.has_key?(skey)
+             relations[skey] = value #the relation because we want the method to load the association through method missing
+          when Hash
+            resource = find_or_create_resource_for(key) #TODO check!
+            @attributes[skey] = resource@attributes[skey].new(value)
+          else
+            @attributes[skey] = value.dup rescue value
+        end
       end
     end
 
     self
   end
 
-  #compatible with the Rails way but also supports OpenERP context
+  #compatible with the Rails way but also supports OpenERP context; TODO: properly pass one2many and many2many object graph like GTK client
   def create(context={})
     self.pre_cast_attributes
-    self.id = self.class.rpc_execute('create', @attributes, context)
-    load(self.class.find(self.id, :context => context).attributes)
+    m2o = @relations.reject{|k, v| !self.class.many2one_relations.has_key?(k)}
+    vals = @attributes.merge(m2o.merge(m2o){|k, v| v.is_a?(Array) ? v[0] : v})
+    self.id = self.class.rpc_execute('create', vals, context)
+    reload_from_record!(self.class.find(self.id, :context => context))
   end
 
-  #compatible with the Rails way but also supports OpenERP context
+  #compatible with the Rails way but also supports OpenERP context; TODO: properly pass one2many and many2many object graph like GTK client
   def update(context={})
     self.pre_cast_attributes
-    self.class.rpc_execute('write', self.id, @attributes.reject{|k, v| k == 'id'}, context)
-    load(self.class.find(self.id, :context => context).attributes)
+    m2o = @relations.reject{|k, v| !self.class.many2one_relations.has_key?(k)}
+    vals = @attributes.reject {|key, value| key == 'id'}.merge(m2o.merge(m2o){|k, v| v.is_a?(Array) ? v[0] : v})
+    self.class.rpc_execute('write', self.id, vals, context)
+    reload_from_record!(self.class.find(self.id, :context => context))
   end
 
   #compatible with the Rails way but also supports OpenERP context
@@ -281,7 +294,7 @@ class OpenObjectResource < ActiveResource::Base
   #wrapper for OpenERP exec_workflow Business Process Management engine
   def wkf_action(action, context={})
     self.class.rpc_exec_workflow(action, self.id) #FIXME looks like OpenERP exec_workflow doesn't accept context but it might be a bug
-    load(self.class.find(self.id, :context => context).attributes)
+    reload_from_record!(self.class.find(self.id, :context => context))
   end
 
   def old_wizard_step(wizard_name, step='init', wizard_id=nil, form={}, context={})
@@ -308,18 +321,22 @@ class OpenObjectResource < ActiveResource::Base
   def method_missing(method_symbol, *arguments)
     method_name = method_symbol.to_s
     return @loaded_relations[method_name] if @loaded_relations.has_key?(method_name)
-    result = relationnal_result(method_name, *arguments)
-    if result
-      @loaded_relations[method_name] = result
-      return result 
-    elsif @relations and @relations.has_key?(method_name) and !self.class.many2one_relations.empty?
-      #maybe the relation is inherited or could be inferred from a related field
-      self.class.many2one_relations.each do |k, field|
-        model = self.class.load_relation(field.relation, @relations[method_name][0], *arguments)
-        result = model.relationnal_result(method_name, *arguments)
-        return result if result
+    if @relations.has_key?(method_name) and !@relations[method_name]
+      return false
+    else
+      result = relationnal_result(method_name, *arguments)
+      if result
+        @loaded_relations[method_name] = result
+        return result
+      elsif @relations and @relations.has_key?(method_name) and !self.class.many2one_relations.empty?
+        #maybe the relation is inherited or could be inferred from a related field
+        self.class.many2one_relations.each do |k, field|
+          model = self.class.load_relation(field.relation, @relations[method_name][0], *arguments)
+          result = model.relationnal_result(method_name, *arguments)
+          return result if result
+        end
+        super
       end
-      super
     end
     super
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
-- Raphael Valyi - www.akretion.com
+  - Raphael Valyi - www.akretion.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -02:00
+date: 2009-12-16 00:00:00 -02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activeresource
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.1
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: activeresource
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.1
+      version: 
 description: OOOR exposes business object proxies to your Ruby (Rails or not) application, that map seamlessly to your remote OpenObject/OpenERP server using webservices. It extends the standard ActiveResource API.
 email: rvalyi@akretion.com
 executables: []
@@ -31,13 +31,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.md
-- MIT-LICENSE
-- lib/ooor.rb
-- lib/app/models/open_object_resource.rb
-- lib/app/models/open_object_ui.rb
-- lib/app/controllers/open_objects_controller.rb
-- ooor.yml
+  - README.md
+  - MIT-LICENSE
+  - lib/ooor.rb
+  - lib/app/models/open_object_resource.rb
+  - lib/app/models/open_object_ui.rb
+  - lib/app/controllers/open_objects_controller.rb
+  - ooor.yml
 has_rdoc: true
 homepage: http://github.com/rvalyi/ooor
 licenses: []
@@ -46,18 +46,18 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 requirements: []