ooor 1.5.3 → 1.6.0

data/README.md

@@ -159,6 +159,7 @@ Request params or ActiveResource equivalence of OpenERP domain (but degraded as
 OpenERP search method:
 
     $ ResPartner.search([['name', 'ilike', 'a']], 0, 2)
+
 Arguments are: domain, offset=0, limit=false, order=false, context={}, count=false
 
 
@@ -187,7 +188,9 @@ Load only specific fields support (faster than loading all fields):
     $ ProductProduct.find(:all, :fields=>["state", "id"])
     $ ProductProduct.find([1,2], :fields=>["state", "id"])
     $ ProductProduct.find(:all, :fields=>["state", "id"])
+
     even in relations:
+
     $ SaleOrder.find(1).order_line(:fields => ["state"])
 
 
@@ -243,6 +246,7 @@ On the fly one2many object graph update/creation:
 
 Just like the OpenERP GTK client (and unlike the web client), in OOOR you can pass create/update
 one2many relation in place directly. For instance:
+
     $ so = SaleOrder.new
     $ so.on_change('onchange_partner_id', :partner_id, 1, 1, false) #auto-complete the address and other data based on the partner
     $ so.order_line = [SaleOrderLine.new(:name => 'sl1', :product_id => 1, :price_unit => 42, :product_uom => 1)] #create one order line
@@ -281,9 +285,12 @@ just like Rails fixtures, OpenERP supports absolute ids for its records, especia
 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
 
 
@@ -292,6 +299,7 @@ Change logged user:
     $ Ooor.global_login('demo', 'demo')
     $ s = SaleOrder.find(2)
     $ => 'Access denied error'
+
 Notice that this changes the globally logged user and doesn't address the issue of
 different users using Ooor concurrently with different credentials as you might want
 for instance in a Rails web application. That second issue will be addressed at
@@ -302,6 +310,7 @@ Change log level:
 
 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/bin/ooor

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-puts "*** OOOR - OpenObject on Rails! is published under the AGPL license by Akretion.com ***"
+puts "*** OOOR - OpenObject on Ruby! Published under the AGPL license by Akretion.com ***"
 
 require 'irb'
 require 'rubygems'

data/lib/app/models/common_service.rb

@@ -21,7 +21,7 @@ module Ooor
     def global_login(user, password)
       @config[:username] = user
       @config[:password] = password
-      @config[:user_id] = OpenObjectResource.client(@base_url + "/common").call("login", @config[:database], user, password)
+      @config[:user_id] = get_rpc_client(@base_url + "/common").call("login", @config[:database], user, password)
       rescue Exception => error
         @logger.error """login to OpenERP server failed:
          #{error.inspect}
@@ -36,7 +36,7 @@ module Ooor
     [:ir_get, :ir_set, :ir_del, :about, :logout, :timezone_get, :get_available_updates, :get_migration_scripts, :get_server_environment, :login_message, :check_connectivity].each do |meth|
       self.instance_eval do
         define_method meth do |*args|
-          OpenObjectResource.client(@base_url + "/common").call(meth.to_s, *args)
+          get_rpc_client(@base_url + "/common").call(meth.to_s, *args)
         end
       end
     end

data/lib/app/models/db_service.rb

@@ -19,7 +19,7 @@
 module Ooor
   module DbService
     def create(password=@config[:db_password], db_name='ooor_db', demo=true, lang='en_US', user_password=@config[:password] || 'admin')
-      process_id = OpenObjectResource.client(@base_url + "/db").call("create", password, db_name, demo, lang, user_password)
+      process_id = get_rpc_client(@base_url + "/db").call("create", password, db_name, demo, lang, user_password)
       @config[:database] = db_name
       @config[:username] = 'admin'
       @config[:passowrd] = user_password
@@ -31,14 +31,14 @@ module Ooor
     end
 
     def drop(password=@config[:db_password], db_name='ooor_db')
-      OpenObjectResource.client(@base_url + "/db").call("drop", password, db_name)
+      get_rpc_client(@base_url + "/db").call("drop", password, db_name)
     end
 
     #we generate methods handles for use in auto-completion tools such as jirb_swing
     [:get_progress, :dump, :restore, :rename, :db_exist, :list, :change_admin_password, :list_lang, :server_version, :migrate_databases].each do |meth|
       self.instance_eval do
         define_method meth do |*args|
-          OpenObjectResource.client(@base_url + "/db").call(meth.to_s, *args)
+          get_rpc_client(@base_url + "/db").call(meth.to_s, *args)
         end
       end
     end

data/lib/app/models/ooor_client.rb

@@ -18,7 +18,12 @@
 require 'xmlrpc/client'
 
 module Ooor
-  class OOORClient < XMLRPC::Client
+  class XMLClient < XMLRPC::Client
+    def self.new2(ooor, url, p, timeout)
+      @ooor = ooor
+      super(url, p, timeout)
+    end
+    
     def call2(method, *args)
       request = create().methodCall(method, *args)
       data = (["<?xml version='1.0' encoding='UTF-8'?>\n"] + do_rpc(request, false).lines.to_a[1..-1]).join  #encoding is not defined by OpenERP and can lead to bug with Ruby 1.9

data/lib/app/models/open_object_resource.rb

@@ -19,7 +19,6 @@ require 'rubygems'
 require 'active_resource'
 require 'app/ui/form_model'
 require 'app/models/uml'
-require 'app/models/ooor_client'
 require 'app/models/type_casting'
 require 'app/models/relation'
 
@@ -113,11 +112,6 @@ module Ooor
       def order(value); relation.order(value); end
       def offset(value); relation.offset(value); end
 
-      def client(url)
-        @clients ||= {}
-        @clients[url] ||= OOORClient.new2(url, nil, 900)
-      end
-
       #corresponding method for OpenERP osv.execute(self, db, uid, obj, method, *args, **kw) method
       def rpc_execute(method, *args)
         rpc_execute_with_object(@openerp_model, method, *args)
@@ -141,7 +135,7 @@ module Ooor
         clean_request_args!(args)
         reload_fields_definition()
         logger.debug "OOOR RPC: rpc_method: 'execute', db: #{db}, uid: #{uid}, pass: #, obj: #{obj}, method: #{method}, *args: #{args.inspect}"
-        cast_answer_to_ruby!(client((@database && @site || @ooor.base_url) + "/object").call("execute",  db, uid, pass, obj, method, *args))
+        cast_answer_to_ruby!(@ooor.get_rpc_client("#{(@database && @site || @ooor.base_url)}/object").call("execute",  db, uid, pass, obj, method, *args))
       end
 
        #corresponding method for OpenERP osv.exec_workflow(self, db, uid, obj, method, *args)
@@ -157,7 +151,7 @@ module Ooor
         clean_request_args!(args)
         reload_fields_definition()
         logger.debug "OOOR RPC: 'exec_workflow', db: #{db}, uid: #{uid}, pass: #, obj: #{obj}, action: #{action}, *args: #{args.inspect}"
-        cast_answer_to_ruby!(client((@database && @site || @ooor.base_url) + "/object").call("exec_workflow", db, uid, pass, obj, action, *args))
+        cast_answer_to_ruby!(@ooor.get_rpc_client("#{(@database && @site || @ooor.base_url)}/object").call("exec_workflow", db, uid, pass, obj, action, *args))
       end
 
       def old_wizard_step(wizard_name, ids, step='init', wizard_id=nil, form={}, context={}, report_type='pdf')
@@ -165,12 +159,12 @@ module Ooor
         cast_request_to_openerp!(form)
         unless wizard_id
           logger.debug "OOOR RPC: 'create old_wizard_step' #{wizard_name}"
-          wizard_id = cast_answer_to_ruby!(client((@database && @site || @ooor.base_url) + "/wizard").call("create",  @database || @ooor.config[:database], @user_id || @ooor.config[:user_id], @password || @ooor.config[:password], wizard_name))
+          wizard_id = cast_answer_to_ruby!(@ooor.get_rpc_client((@database && @site || @ooor.base_url) + "/wizard").call("create",  @database || @ooor.config[:database], @user_id || @ooor.config[:user_id], @password || @ooor.config[:password], wizard_name))
         end
         params = {'model' => @openerp_model, 'form' => form, 'report_type' => report_type}
         params.merge!({'id' => ids[0], 'ids' => ids}) if ids
         logger.debug "OOOR RPC: 'execute old_wizard_step' #{wizard_id}, #{params.inspect}, #{step}, #{context}"
-        [wizard_id, cast_answer_to_ruby!(client((@database && @site || @ooor.base_url) + "/wizard").call("execute",  @database || @ooor.config[:database], @user_id || @ooor.config[:user_id], @password || @ooor.config[:password], wizard_id, params, step, context))]
+        [wizard_id, cast_answer_to_ruby!(@ooor.get_rpc_client("#{(@database && @site || @ooor.base_url)}/wizard").call("execute",  @database || @ooor.config[:database], @user_id || @ooor.config[:user_id], @password || @ooor.config[:password], wizard_id, params, step, context))]
       end
 
       def method_missing(method_symbol, *arguments)        

data/lib/app/models/type_casting.rb

@@ -25,24 +25,31 @@ module Ooor
         if args[-1].is_a? Hash
           args[-1] = @ooor.global_context.merge(args[-1])
         elsif args.is_a?(Array)
+          args.map! {|v| value_to_openerp(v)}
           args += [@ooor.global_context]
         end
-        cast_request_to_openerp!(args[-2]) if args[-2].is_a? Hash
+        cast_map_to_openerp!(args[-2]) if args[-2].is_a? Hash
+      end
+      
+      def value_to_openerp(v)
+        if v == nil
+          return false
+        elsif !v.is_a?(Integer) && !v.is_a?(Float) && v.is_a?(Numeric) && v.respond_to?(:to_f)
+          return v.to_f
+        elsif !v.is_a?(Numeric) && !v.is_a?(Integer) && v.respond_to?(:sec) && v.respond_to?(:year)#really ensure that's a datetime type
+          return "#{v.year}-#{v.month}-#{v.day} #{v.hour}:#{v.min}:#{v.sec}"
+        elsif !v.is_a?(Numeric) && !v.is_a?(Integer) && v.respond_to?(:day) && v.respond_to?(:year)#really ensure that's a date type
+          return "#{v.year}-#{v.month}-#{v.day}"
+        elsif v == "false" #may happen with OOORBIT
+          return false
+        else
+          v
+        end
       end
 
-      def cast_request_to_openerp!(map)
+      def cast_map_to_openerp!(map)
         map.each do |k, v|
-          if v == nil
-            map[k] = false
-          elsif !v.is_a?(Integer) && !v.is_a?(Float) && v.is_a?(Numeric) && v.respond_to?(:to_f)
-            map[k] = v.to_f
-          elsif !v.is_a?(Numeric) && !v.is_a?(Integer) && v.respond_to?(:sec) && v.respond_to?(:year)#really ensure that's a datetime type
-            map[k] = "#{v.year}-#{v.month}-#{v.day} #{v.hour}:#{v.min}:#{v.sec}"
-          elsif !v.is_a?(Numeric) && !v.is_a?(Integer) && v.respond_to?(:day) && v.respond_to?(:year)#really ensure that's a date type
-            map[k] = "#{v.year}-#{v.month}-#{v.day}"
-          elsif v == "false" #may happen with OOORBIT
-            map[k] = false
-          end
+          map[k] = value_to_openerp(v)
         end
       end
 

data/lib/ooor.rb

@@ -49,6 +49,29 @@ module Ooor
       {}
     end
 
+    def get_rpc_client(url)
+      @rpc_clients ||= {}
+      unless @rpc_clients[url]
+        if defined?(Java) && @config[:rpc_client] != 'ruby'
+          begin
+            require 'jooor'
+            @rpc_clients[url] = get_java_rpc_client(url)
+          rescue LoadError
+            puts "WARNING falling back on Ruby xmlrpc/client client (much slower). Install the 'jooor' gem if you want Java speed for the RPC!"
+            @rpc_clients[url] = get_ruby_rpc_client(url)
+          end
+        else
+          @rpc_clients[url] = get_ruby_rpc_client(url)
+        end
+      end
+      @rpc_clients[url]
+    end
+
+    def get_ruby_rpc_client(url)
+      require 'app/models/ooor_client'
+      XMLClient.new2(self, url, nil, @config[:rpc_timeout] || 900)
+    end
+
     def initialize(config, env=false)
       @config = config.is_a?(String) ? Ooor.load_config(config, env) : config
       @config.symbolize_keys!
@@ -72,9 +95,9 @@ module Ooor
       if to_load_models #we load only a customized subset of the OpenERP models
         model_ids = @ir_model_class.search([['model', 'in', to_load_models]])
       else #we load all the models
-        model_ids = @ir_model_class.search() - [1]
+        model_ids = @config[:search_models] && @ir_model_class.search() - [1] || @config[:nb_models] || (501.times.map{|i| i}[2..500])
       end
-      models = @ir_model_class.read(model_ids, ['name', 'model', 'id', 'info', 'state'])#, 'field_id', 'access_ids'])
+      models = @ir_model_class.read(model_ids, ['model'])#['name', 'model', 'id', 'info', 'state'])#, 'field_id', 'access_ids'])
       @global_context.merge!({}).merge!(@config[:global_context] || {})
       models.each {|openerp_model| define_openerp_model(openerp_model, @config[:scope_prefix])}
     end
@@ -106,7 +129,6 @@ module Ooor
       @loaded_models.push(klass)
       klass
     end
-
   end
   
   if defined?(Rails) #Optional autoload in Rails:

metadata

@@ -1,64 +1,56 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 3
-  version: 1.5.3
+  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors: 
-- Raphael Valyi - www.akretion.com
+  - Raphael Valyi - www.akretion.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -03:00
+date: 2011-08-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activeresource
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: activeresource
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.5
+    type: :runtime
+    version_requirements: *id001
 description: OOOR exposes business object proxies to your Ruby (Rails or not) application, that maps seamlessly to your remote OpenObject/OpenERP server using webservices. It extends the standard ActiveResource API. Running on JRuby, OOOR also offers a convenient bridge between OpenERP and the Java eco-system
 email: rvalyi@akretion.com
 executables: 
-- ooor
+  - ooor
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- README.md
-- agpl-3.0-licence.txt
-- lib/ooor.rb
-- ooor.yml
-- lib/app/models/open_object_resource.rb
-- lib/app/models/type_casting.rb
-- lib/app/models/uml.rb
-- lib/app/models/base64.rb
-- lib/app/models/ooor_client.rb
-- lib/app/models/relation.rb
-- lib/app/models/db_service.rb
-- lib/app/models/common_service.rb
-- lib/app/ui/action_window.rb
-- lib/app/ui/client_base.rb
-- lib/app/ui/form_model.rb
-- lib/app/ui/menu.rb
-- spec/ooor_spec.rb
-- bin/ooor
+  - README.md
+  - agpl-3.0-licence.txt
+  - lib/ooor.rb
+  - ooor.yml
+  - lib/app/models/open_object_resource.rb
+  - lib/app/models/type_casting.rb
+  - lib/app/models/uml.rb
+  - lib/app/models/base64.rb
+  - lib/app/models/ooor_client.rb
+  - lib/app/models/relation.rb
+  - lib/app/models/db_service.rb
+  - lib/app/models/common_service.rb
+  - lib/app/ui/action_window.rb
+  - lib/app/ui/client_base.rb
+  - lib/app/ui/form_model.rb
+  - lib/app/ui/menu.rb
+  - spec/ooor_spec.rb
+  - bin/ooor
 has_rdoc: true
 homepage: http://github.com/rvalyi/ooor
 licenses: []
@@ -67,27 +59,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: OOOR - OpenObject On Ruby