ooor 1.0.6 → 1.0.7

data/README.md

@@ -113,6 +113,8 @@ That the easiest option to get started while you might not want that in producti
 
 Then just start your Rails application, your OpenERP models will be loaded as you'll see in the Rails log.
 You can then use all the OOOR API upon all loaded OpenERP models in your regular Rails code (see API usage section).
+A good way to start playing with OOOR is inside the console, using:
+    $ ruby script/console #or jruby script/console on JRuby of course
 
 Enabling REST HTTP routes to your OpenERP models:
 in your config/route.rb, you can alternatively enable routes to all your OpenERP models by addding:
@@ -177,7 +179,7 @@ Inherited relations support:
     $ ProductProduct.find(1).categ_id #where categ_id is inherited from the ProductTemplate
 
 Please notice that loaded relations are cached (to avoid  hitting OpenERP over and over)
-until the root object is reloaded (after save/update for instance)
+until the root object is reloaded (after save/update for instance).
 Currently, save/update doesn't save the whole object graph but only the current object.
 We might change this in the future to match the way OpenERP clients are working which
 is supported by the OpenERP ORM, see issue: http://github.com/rvalyi/ooor/issues/#issue/3
@@ -252,7 +254,7 @@ the API level but it's not easy as ActiveResource has not been designed for it.
 
 Change log level:
 
-By default the log level is very verbose (debug level) to help newcomers to jumpstart
+By default the log level is very verbose (debug level) to help newcomers to jumpstart.
 However you might want to change that. 2 solutions:
     $ Ooor.logger.level = 1 #available levels are those of the standard Ruby Logger class: 0 debug, 1 info, 2 error
     $ In the config yaml file or hash, set the :log_level parameter

data/lib/app/models/open_object_resource.rb

@@ -1,6 +1,11 @@
 require 'xmlrpc/client'
 require 'activeresource'
 
+#TODO implement method missing on the OpenObjectResource level and proxy the method upon the RPC client, as done in openerp/tools/rpc.py
+#in the official web client
+
+#TODO implement passing session credentials to RPC methods (concurrent access of different user credentials in Rails)
+
 class OpenObjectResource < ActiveResource::Base
 
   # ******************** class methods ********************
@@ -94,6 +99,9 @@ class OpenObjectResource < ActiveResource::Base
 
     #corresponding method for OpenERP osv.execute(self, db, uid, obj, method, *args, **kw) method
     def rpc_execute_with_all(db, uid, pass, obj, method, *args)
+      if args[-1].is_a? Hash
+        args[-1] = Ooor.global_context.merge(args[-1])
+      end
       logger.debug "rpc_execute_with_all: rpc_methods: 'execute', db: #{db.inspect}, uid: #{uid.inspect}, pass: #{pass.inspect}, obj: #{obj.inspect}, method: #{method}, *args: #{args.inspect}"
       try_with_pretty_error_log { client(@database && @site || Ooor.object_url).call("execute",  db, uid, pass, obj, method, *args) }
     end
@@ -108,6 +116,9 @@ class OpenObjectResource < ActiveResource::Base
     end
 
     def rpc_exec_workflow_with_all(db, uid, pass, obj, action, *args)
+      if args[-1].is_a? Hash
+        args[-1] = Ooor.global_context.merge(args[-1])
+      end
       logger.debug "rpc_execute_with_all: rpc_methods: 'exec_workflow', db: #{db.inspect}, uid: #{uid.inspect}, pass: #{pass.inspect}, obj: #{obj.inspect}, action #{action}, *args: #{args.inspect}"
       try_with_pretty_error_log { client(@database && @site || Ooor.object_url).call("exec_workflow", db, uid, pass, obj, action, *args) }
     end
@@ -115,7 +126,7 @@ class OpenObjectResource < ActiveResource::Base
     #grab the eventual error log from OpenERP response as OpenERP doesn't enforce carefuly
     #the XML/RPC spec, see https://bugs.launchpad.net/openerp/+bug/257581
     def try_with_pretty_error_log
-        yield
+      yield
       rescue RuntimeError => e
         begin
           openerp_error_hash = eval("#{ e }".gsub("wrong fault-structure: ", ""))
@@ -173,7 +184,7 @@ class OpenObjectResource < ActiveResource::Base
         scope = [scope]
         is_collection = false
       end
-      records = rpc_execute('read', scope, *(fields + [context]))
+      records = rpc_execute('read', scope, fields, context)
       active_resources = []
       records.each do |record|
         r = {}
@@ -193,7 +204,7 @@ class OpenObjectResource < ActiveResource::Base
 
   # ******************** instance methods ********************
 
-  attr_accessor :ooor_user, :ooor_password
+  attr_accessor :relations, :loaded_relations
 
   def pre_cast_attributes
     @attributes.each {|k, v| @attributes[k] = ((v.is_a? BigDecimal) ? Float(v) : v)}
@@ -203,6 +214,8 @@ class OpenObjectResource < ActiveResource::Base
     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 = {}
+    @loaded_relations = {}
     attributes.each do |key, value|
       case value
         when Array
@@ -264,36 +277,31 @@ class OpenObjectResource < ActiveResource::Base
 
   # ******************** fake associations like much like ActiveRecord according to the cached OpenERP data model ********************
 
-  def relations
-    @relations ||= {} and @relations
-  end
-
-  def relationnal_result(method_id, *arguments)
+  def relationnal_result(method_name, *arguments)
     self.class.reload_fields_definition unless self.class.field_defined
-    if self.class.many2one_relations[method_id.to_s]
-      self.class.load_relation(self.class.many2one_relations[method_id.to_s].relation, @relations[method_id.to_s][0], *arguments)
-    elsif self.class.one2many_relations[method_id.to_s]
-      self.class.load_relation(self.class.one2many_relations[method_id.to_s].relation, @relations[method_id.to_s], *arguments)
-    elsif self.class.many2many_relations[method_id.to_s]
-      self.class.load_relation(self.class.many2many_relations[method_id.to_s].relation, @relations[method_id.to_s], *arguments)
+    if self.class.many2one_relations.has_key?(method_name)
+      self.class.load_relation(self.class.many2one_relations[method_name].relation, @relations[method_name][0], *arguments)
+    elsif self.class.one2many_relations.has_key?(method_name)
+      self.class.load_relation(self.class.one2many_relations[method_name].relation, @relations[method_name], *arguments)
+    elsif self.class.many2many_relations.has_key?(method_name)
+      self.class.load_relation(self.class.many2many_relations[method_name].relation, @relations[method_name], *arguments)
     else
       false
     end
   end
 
-  def method_missing(method_id, *arguments)
-    @loaded_relations ||= {}
-    result = @loaded_relations[method_id.to_s]
-    return result if result
-    result = relationnal_result(method_id, *arguments)
+  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_id.to_s] = result
+      @loaded_relations[method_name] = result
       return result 
-    elsif @relations and @relations[method_id.to_s] and !self.class.many2one_relations.empty?
+    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_id.to_s][0], *arguments)
-        result = model.relationnal_result(method_id, *arguments)
+        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

data/lib/ooor.rb

@@ -5,7 +5,7 @@ module Ooor
 
   class << self
 
-    attr_accessor :logger, :config, :all_loaded_models, :binding, :common_url, :object_url
+    attr_accessor :logger, :config, :all_loaded_models, :binding, :common_url, :object_url, :global_context
 
     #load the custom configuration
     def load_config(config_file=nil, env=nil)
@@ -44,6 +44,7 @@ module Ooor
       Ooor.logger.level = Ooor.config[:log_level] if Ooor.config[:log_level]
       Ooor.common_url = Ooor.config[:url].gsub(/\/$/,'') + "/common"
       Ooor.object_url = Ooor.config[:url].gsub(/\/$/,'') + "/object"
+      Ooor.global_context = Ooor.config[:global_context] || {}
       Ooor.config[:user_id] = global_login(Ooor.config[:username] || 'admin', Ooor.config[:password] || 'admin')
 
       #*************** load the models

data/ooor.yml

@@ -9,6 +9,9 @@ development:
   #comment the following line if you want to load ALL the available models (slower startup), or complete it with all the OpenERP models you want to be loaded
   models: [res.partner, product.template, product.product, product.category, sale.order, sale.order.line, account.invoice]
   bootstrap: true   #true if you want to load OpenObject models (will hit OpenERP server) at startup; else use Ooor.reload!(lambda {}) to reload the Ooor models at any time
+  #log_level: 0
+  #global_context:
+    #'lang': en_US
 
 test:
   url: http://localhost:8069/xmlrpc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
   - Raphael Valyi - www.akretion.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 -02:00
+date: 2009-11-09 00:00:00 -02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency