ooor 1.7.2 → 1.8.0

data/bin/ooor

@@ -47,6 +47,6 @@ ARGV[0] = "--readline"
 ARGV[1] = "--prompt"
 ARGV[2] = "inf-ruby"
 
-ooor = Ooor.new(:url => url, :database => database || 'demo', :username => username || 'admin', :password => password || 'admin', :log_level => Logger::INFO)
+@ooor = Ooor.new(:url => url, :database => database || 'demo', :username => username || 'admin', :password => password || 'admin', :log_level => Logger::INFO)
 
 IRB.start(__FILE__)

data/lib/app/models/{ooor_client.rb → client_xmlrpc.rb}

@@ -8,11 +8,12 @@ require 'xmlrpc/client'
 module Ooor
   class XMLClient < XMLRPC::Client
     def self.new2(ooor, url, p, timeout)
-      @ooor = ooor
+      @@ooor = ooor
       super(url, p, timeout)
     end
     
     def call2(method, *args)
+      @@ooor.logger.debug 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
       parser().parseMethodResponse(data)

data/lib/app/models/services.rb

@@ -0,0 +1,47 @@
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2013 Akretion LTDA (<http://www.akretion.com>).
+#    Author: Raphaël Valyi
+#    Licensed under the MIT license, see MIT-LICENSE file
+
+#proxies for server/openerp/service/web_services.py
+module Ooor
+  module CommonService
+    %w[ir_get ir_set ir_del about login logout timezone_get get_available_updates get_migration_scripts get_server_environment login_message check_connectivity about get_stats list_http_services version authenticate get_available_updates set_loglevel get_os_time get_sqlcount].each do |meth|
+      self.instance_eval do
+        define_method meth do |*args|
+          get_rpc_client(@base_url + "/common").call(meth, *args)
+        end
+      end
+    end
+  end
+
+  module DbService
+    def create(password=@config[:db_password], db_name='ooor_test', demo=true, lang='en_US', user_password=@config[:password] || 'admin')
+      process_id = get_rpc_client(@base_url + "/db").call("create", password, db_name, demo, lang, user_password)
+      sleep(2)
+      while get_progress(password, process_id)[0] != 1
+        @logger.info "..."
+        sleep(0.5)
+      end
+      global_login('admin', user_password, db_name, false)
+    end
+
+    %w[get_progress drop dump restore rename db_exist list change_admin_password list_lang server_version migrate_databases create_database duplicate_database].each do |meth|
+      self.instance_eval do
+        define_method meth do |*args|
+          get_rpc_client(@base_url + "/db").call(meth, *args)
+        end
+      end
+    end
+  end
+
+  module ReportService
+    %w[report report_get render_report].each do |meth|
+      self.instance_eval do
+        define_method meth do
+          |*args| get_rpc_client(@base_url + "/report").call(meth, *args)
+        end
+      end
+    end
+  end
+end

data/lib/ooor.rb

@@ -5,8 +5,7 @@
 
 require 'logger'
 require 'app/models/open_object_resource'
-require 'app/models/db_service'
-require 'app/models/common_service'
+require 'app/models/services'
 require 'app/models/base64'
 require 'app/ui/client_base'
 
@@ -29,6 +28,7 @@ module Ooor
   class Ooor
     include DbService
     include CommonService
+    include ReportService
     include ClientBase
 
     cattr_accessor :default_ooor, :default_config
@@ -65,7 +65,7 @@ module Ooor
     end
 
     def get_ruby_rpc_client(url)
-      require 'app/models/ooor_client'
+      require 'app/models/client_xmlrpc'
       XMLClient.new2(self, url, nil, @config[:rpc_timeout] || 900)
     end
 
@@ -75,29 +75,32 @@ module Ooor
       @logger = ((defined?(Rails) && $0 != 'irb' && Rails.logger || @config[:force_rails_logger]) ? Rails.logger : Logger.new($stdout))
       @logger.level = @config[:log_level] if @config[:log_level]
       OpenObjectResource.logger = @logger
-      @base_url = @config[:url].gsub(/\/$/,'')
+      @base_url = @config[:url] = "#{@config[:url].gsub(/\/$/,'').chomp('/xmlrpc')}/xmlrpc"
       @loaded_models = []
       scope = Module.new and Object.const_set(@config[:scope_prefix], scope) if @config[:scope_prefix]
-      load_models() if @config[:database]
+      global_login(@config[:username] || 'admin', @config[:password] || 'admin', @config[:database], @config[:models]) if @config[:database]
     end
 
     def const_get(model_key)
       @ir_model_class.const_get(model_key)
     end
 
-    def load_models(to_load_models=@config[:models])
+    def global_login(user, password, database=@config[:database], model_names=false)
+      @config[:username] = user
+      @config[:password] = password
+      @config[:database] = database
+      @config[:user_id] = login(database, user, password)
+      load_models(model_names, true)
+    end
+
+    def load_models(model_names=false, reload=@config[:reload])
       @global_context = @config[:global_context] || {}
-      global_login(@config[:username] || 'admin', @config[:password] || 'admin')
       ([File.dirname(__FILE__) + '/app/helpers/*'] + (@config[:helper_paths] || [])).each {|dir|  Dir[dir].each { |file| require file }}
       @ir_model_class = define_openerp_model({'model' => 'ir.model'}, @config[:scope_prefix])
-      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
-        model_ids = @ir_model_class.search() - [1]
-      end
-      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], nil, nil, nil, nil, @config[:reload])}
+      model_ids = model_names && @ir_model_class.search([['model', 'in', model_names]]) || @ir_model_class.search() - [1]
+      models = @ir_model_class.read(model_ids, ['model'])#['name', 'model', 'id', 'info', 'state', 'field_id', 'access_ids'])
+      @global_context.merge!({}).merge!(@config[:global_context] || {}) #TODO ensure it's required
+      models.each {|openerp_model| define_openerp_model(openerp_model, @config[:scope_prefix], nil, nil, nil, nil, reload)}
     end
 
     def define_openerp_model(param, scope_prefix=nil, url=nil, database=nil, user_id=nil, pass=nil, reload=false)

data/spec/ooor_spec.rb

@@ -39,8 +39,8 @@ describe Ooor do
     end
 
     it "should be able to load a profile" do
-      accounting_module_ids = IrModuleModule.search(['|', ['name','=', 'sale'], ['name','=', 'account_voucher']])
-      accounting_module_ids.each do |accounting_module_id|
+      module_ids = IrModuleModule.search(['name','=', 'sale']) + IrModuleModule.search(['name','=', 'account_voucher']) + IrModuleModule.search(['name','=', 'sale_stock'])
+      module_ids.each do |accounting_module_id|
         mod = IrModuleModule.find(accounting_module_id) 
         unless mod.state == "installed"
           mod.button_install
@@ -95,9 +95,9 @@ describe Ooor do
       end
 
       it "should be able to find using ir.model.data absolute ids" do
-        p = ProductProduct.find('product_product_pc1')
+        p = ResPartner.find('res_partner_1')
         p.should_not be_nil
-        p = ProductProduct.find('product.product_product_pc1')#module scoping is optionnal
+        p = ResPartner.find('base.res_partner_1')#module scoping is optionnal
         p.should_not be_nil
       end
 
@@ -259,8 +259,9 @@ describe Ooor do
 
     describe "Relations assignations" do
       it "should be able to assign many2one relations on new" do
-        s = SaleOrder.new(:partner_id => 2)
-        s.partner_id.id.should == 2
+        new_partner_id = ResPartner.search()[0]
+        s = SaleOrder.new(:partner_id => new_partner_id)
+        s.partner_id.id.should == new_partner_id
       end
 
       it "should be able to do product.taxes_id = [id1, id2]" do
@@ -391,12 +392,12 @@ describe Ooor do
 
   describe "Multi-instance and class name scoping" do
     before(:all) do
-      @ooor1 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE1', :models => ['product.product'], :reload => true)
-      @ooor2 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE2', :models => ['product.product'], :reload => true)
+      @ooor1 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE1', :models => ['res.partner', 'product.product'], :reload => true)
+      @ooor2 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE2', :models => ['res.partner', 'product.product'], :reload => true)
     end
 
     it "should still be possible to find a ressource using an absolute id" do
-      OE1::ProductProduct.find('product_product_pc1').should be_kind_of(OE1::ProductProduct)
+      OE1::ResPartner.find('res_partner_1').should be_kind_of(OE1::ResPartner)
     end
 
     it "should be able to read in one instance and write in an other" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooor
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -45,10 +45,9 @@ files:
 - lib/app/models/serialization.rb
 - lib/app/models/uml.rb
 - lib/app/models/base64.rb
-- lib/app/models/ooor_client.rb
+- lib/app/models/client_xmlrpc.rb
 - lib/app/models/relation.rb
-- lib/app/models/db_service.rb
-- lib/app/models/common_service.rb
+- lib/app/models/services.rb
 - lib/app/ui/action_window.rb
 - lib/app/ui/client_base.rb
 - lib/app/ui/form_model.rb

data/lib/app/models/common_service.rb

@@ -1,35 +0,0 @@
-#    OOOR: OpenObject On Ruby
-#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
-#    Author: Raphaël Valyi
-#    Licensed under the MIT license, see MIT-LICENSE file
-
-#proxies all 'common' class of OpenERP server/bin/service/web_service.py properly
-module Ooor
-  module CommonService
-
-    def login(database, user, password)
-      get_rpc_client(@base_url + "/common").call("login", database, user, password)
-    end 
-
-    def global_login(user, password)
-      @config[:username] = user
-      @config[:password] = password
-      @config[:user_id] = login(@config[:database], user, password)
-      rescue RuntimeError => error
-         @logger.error """login to OpenERP server failed:
-         #{error.inspect}
-         Are your sure the server is started? Are your login parameters correct? Can this server ping the OpenERP server?
-         login XML/RPC url was #{@config[:url].gsub(/\/$/,'') + "/common"}"""
-        raise
-    end
-
-    #we generate methods handles for use in auto-completion tools such as jirb_swing
-    [: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|
-          get_rpc_client(@base_url + "/common").call(meth.to_s, *args)
-        end
-      end
-    end
-  end
-end

data/lib/app/models/db_service.rb

@@ -1,29 +0,0 @@
-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 = 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
-      sleep(3)
-      while get_progress(password, process_id)[0] != 1
-        @logger.info "..."
-        sleep(0.5)
-      end
-      load_models()
-    end
-
-    def drop(password=@config[:db_password], db_name='ooor_db')
-      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|
-          get_rpc_client(@base_url + "/db").call(meth.to_s, *args)
-        end
-      end
-    end
-  end
-end