ooor 1.2.4 → 1.2.5

data/lib/app/models/open_object_resource.rb

@@ -112,7 +112,7 @@ class OpenObjectResource < ActiveResource::Base
           if openerp_error_hash.is_a? Hash
             logger.error "*********** OpenERP Server ERROR:
             #{openerp_error_hash["faultString"]}***********"
-            e.backtrace.each {|line| logger.error line if line.index("ooor")} and return nil
+            e.backtrace.each {|line| logger.error line unless line.index("lib/ruby")} and return nil
           else
             raise
           end
@@ -186,14 +186,12 @@ class OpenObjectResource < ActiveResource::Base
 
   def cast_attributes_to_ruby!
     @attributes.each do |k, v|
-      if self.class.fields[k]
-        if v.is_a?(String)
-          case self.class.fields[k].ttype
-            when 'datetime'
-              @attributes[k] = Time.parse(v)
-            when 'date'
-              @attributes[k] = Date.parse(v)
-          end
+      if self.class.fields[k] && v.is_a?(String) && !v.empty?
+        case self.class.fields[k].ttype
+          when 'datetime'
+            @attributes[k] = Time.parse(v)
+          when 'date'
+            @attributes[k] = Date.parse(v)
         end
       end
     end
@@ -233,12 +231,15 @@ class OpenObjectResource < ActiveResource::Base
     end
 
     @relations.each do |k, v| #see OpenERP awkward relations API
-      next if v.is_a?(Array) && v.size == 1 && v[0].is_a?(Array) #already casted, possibly before server error!
+      #already casted, possibly before server error!
+      next if (v.is_a?(Array) && v.size == 1 && v[0].is_a?(Array)) \
+              || self.class.many2one_relations[k] \
+              || !v.is_a?(Array)
       new_rel = self.cast_relation(k, v, self.class.one2many_relations, self.class.many2many_relations)
       if new_rel #matches a known o2m or m2m
         @relations[k] = new_rel
       else
-        self.class.many2one_relations.each do |k2, field| #try to cast the relation to na inherited o2m or m2m:
+        self.class.many2one_relations.each do |k2, field| #try to cast the relation to an inherited o2m or m2m:
           linked_class = self.class.const_get(field.relation)
           new_rel = self.cast_relation(k, v, linked_class.one2many_relations, linked_class.many2many_relations)
           @relations[k] = new_rel and break if new_rel
@@ -389,8 +390,12 @@ class OpenObjectResource < ActiveResource::Base
     self.class.reload_fields_definition() unless self.class.fields_defined
 
     if is_assign
-      know_relations = self.class.relations_keys + self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).relations_keys}.flatten
-      @relations[method_key] = arguments[0] and return if know_relations.index(method_key)
+      known_relations = self.class.relations_keys + self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).relations_keys}.flatten
+      if known_relations.index(method_key)
+        @relations[method_key] = arguments[0]
+        @loaded_relations[method_key] = arguments[0]
+        return
+      end
       know_fields = self.class.fields.keys + self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).fields.keys}.flatten
       @attributes[method_key] = arguments[0] and return if know_fields.index(method_key)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Raphael Valyi - www.akretion.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -02:00
+date: 2010-02-05 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency