ooor 1.2.6 → 1.2.7

data/README.md

@@ -273,6 +273,18 @@ Call old style wizards:
     $ TODO test and document new osv_memory wizards API
 
 
+Absolute OpeNERP ids aka ir_model_data:
+
+just like Rails fixtures, OpenERP supports absolute ids for its records, especially those imported from XML or CSV.
+We are here speaking about the string id of the XML or CSV records, eventually prefixed by the module name.
+Using those ids rather than the SQL ids is a good idea to avoid relying on a particular installation.
+In OOOR, you can both retrieve one or several records using those ids, like for instance:
+    $ ProductCategory.find('product.product_category_3')
+Notice that the 'product.' module prefix is optional here but important if you have similar ids in different module scopes.
+You can also create a resource and it's ir_model_data record alltogether using the ir_mode_data_id param:
+    $ ProductCategory.create(:name => 'rails_categ', :ir_model_data_id =>['product', 'categ_x']) #1st tab element is the module, 2nd the id in the module
+
+
 Change logged user:
 
     $ Ooor.global_login('demo', 'demo')

data/lib/app/models/open_object_resource.rb

@@ -112,16 +112,12 @@ class OpenObjectResource < ActiveResource::Base
       rescue RuntimeError => e
         begin
           openerp_error_hash = eval("#{ e }".gsub("wrong fault-structure: ", ""))
-          if openerp_error_hash.is_a? Hash
-            logger.error "*********** OpenERP Server ERROR:
-            #{openerp_error_hash["faultString"]}***********"
-            e.backtrace.each {|line| logger.error line unless line.index("lib/ruby")} and return nil
-          else
-            raise
-          end
-        rescue
-          raise
+        rescue SyntaxError
+          raise e
         end
+        raise e unless openerp_error_hash.is_a? Hash
+        logger.error "*********** OpenERP Server ERROR:\n#{openerp_error_hash["faultString"]}***********"
+        raise RuntimeError.new('OpenERP server error')
     end
 
     def clean_request_args!(args)
@@ -170,7 +166,10 @@ class OpenObjectResource < ActiveResource::Base
       end
     end
 
-    def method_missing(method_symbol, *arguments) self.rpc_execute(method_symbol.to_s, *arguments) end
+    def method_missing(method_symbol, *arguments)
+      raise RuntimeError.new("Invalid RPC method:  #{method_symbol}") if [:type!, :allowed!].index(method_symbol)
+      self.rpc_execute(method_symbol.to_s, *arguments)
+    end
 
 
     # ******************** finders low level implementation ********************
@@ -200,10 +199,18 @@ class OpenObjectResource < ActiveResource::Base
       context = options[:context] || {}
       prefix_options, query_options = split_options(options[:params])
       is_collection = true
-      if !scope.is_a? Array
-        scope = [scope]
-        is_collection = false
-      end
+      scope = [scope] and is_collection = false if !scope.is_a? Array
+      scope.map! do |item|
+        if item.is_a? String #triggers ir_model_data absolute reference lookup
+          tab = item.split(".")
+          domain = [['name', '=', tab[-1]]]
+          domain += [['module', '=', tab[-2]]] if tab[-2]
+          ir_model_data = IrModelData.find(:first, :domain => domain)
+          ir_model_data && ir_model_data.res_id && search([['id', '=', ir_model_data.res_id]])[0]
+        else
+          item
+        end
+      end.reject! {|item| !item}
       records = rpc_execute('read', scope, fields, context)
       active_resources = []
       records.each do |record|
@@ -231,7 +238,7 @@ class OpenObjectResource < ActiveResource::Base
 
   # ******************** instance methods ********************
 
-  attr_accessor :relations, :loaded_relations
+  attr_accessor :relations, :loaded_relations, :ir_model_data_id
 
   def cast_relations_to_openerp!
     @relations.reject! do |k, v| #reject non asigned many2one or empty list
@@ -327,6 +334,7 @@ class OpenObjectResource < ActiveResource::Base
   def initialize(attributes = {}, default_get_list=false, context={})
     @attributes     = {}
     @prefix_options = {}
+    @ir_model_data_id = attributes.delete(:ir_model_data_id)
     if ['ir.model', 'ir.model.fields'].index(self.class.openerp_model) || default_get_list == []
       load(attributes)
     else
@@ -337,20 +345,21 @@ class OpenObjectResource < ActiveResource::Base
   end
 
   #compatible with the Rails way but also supports OpenERP context
-  def create(context={})
+  def create(context={}, reload=true)
     self.id = self.class.rpc_execute('create', to_openerp_hash!, context)
-    reload_from_record!(self.class.find(self.id, :context => context))
+    IrModelData.create(:model => self.class.openerp_model, :module => @ir_model_data_id[0], :name=> @ir_model_data_id[1], :res_id => self.id) if @ir_model_data_id
+    reload_from_record!(self.class.find(self.id, :context => context)) if reload
   end
 
   #compatible with the Rails way but also supports OpenERP context
-  def update(context={})
+  def update(context={}, reload=true)
     self.class.rpc_execute('write', self.id, to_openerp_hash!, context)
-    reload_from_record!(self.class.find(self.id, :context => context))
+    reload_from_record!(self.class.find(self.id, :context => context)) if reload
   end
 
   #compatible with the Rails way but also supports OpenERP context
   def destroy(context={})
-    self.class.rpc_execute('unlink', self.id, context)
+    self.class.rpc_execute('unlink', [self.id], context)
   end
 
   #OpenERP copy method, load persisted copied Object
@@ -423,7 +432,9 @@ class OpenObjectResource < ActiveResource::Base
     return @loaded_relations[method_name] if @loaded_relations.has_key?(method_name)
     return false if @relations.has_key?(method_name) and (!@relations[method_name] || @relations[method_name].is_a?(Array) && !@relations[method_name][0])
 
-    return false if self.class.relations_keys.index(method_name) && !@relations[method_name]
+    if self.class.relations_keys.index(method_name) && !@relations[method_name]
+      return self.class.many2one_relations.index(method_name) ? nil : []
+    end
     result = relationnal_result(method_name, *arguments)
     @loaded_relations[method_name] = result and return result if result
 

data/lib/ooor.rb

@@ -49,6 +49,7 @@ class Ooor
     OpenObjectResource.logger = @logger
     @ir_model_class = define_openerp_model("ir.model", nil, nil, nil, nil, config[:scope_prefix])
     define_openerp_model("ir.model.fields", nil, nil, nil, nil, config[:scope_prefix])
+    define_openerp_model("ir.model.data", nil, nil, nil, nil, config[:scope_prefix])
 
     if config[:models] #we load only a customized subset of the OpenERP models
       models = @ir_model_class.find(:all, :domain => [['model', 'in', config[:models]]])

metadata

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