ooor 1.0.8 → 1.0.9

data/README.md

@@ -239,6 +239,20 @@ Call aribtrary method:
 
     $ use static ObjectClass.rpc_execute_with_all method
     $ or object.call(method_name, args*) #were args is an aribtrary list of arguments
+    $ or use the method missing wrapper that will proxy any OpenERP osv.py/orm.py method, see fo instance:
+    $ ResPartner.name_search('ax', [], 'ilike', {})
+    $ ProductProduct.fields_view_get(132, 'tree', {})
+
+
+Call old wizards:
+
+    $ inv = AccountInvoice.find(4)
+    $ wizard = inv.old_wizard_step('account.invoice.pay') #tip: you can inspect the wizard fields, arch and datas
+    $ wizard.reconcile({:journal_id => 6, :name =>"from_rails"}) #if you want to pay all; will give you a reloaded invoice
+    $ #or if you want a payment with a write off:
+    $ wizard.writeoff_check({"amount" => 12, "journal_id" => 6, "name" =>'from_rails'}) #use the button name as the wizard method
+    $ wizard.reconcile({required missing write off fields...}) #will give you a reloaded invoice because state is 'end'
+    $ TODO test and document new osv_memory wizards API
 
 
 Change logged user:

data/lib/app/models/open_object_resource.rb

@@ -1,8 +1,6 @@
 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
+require 'app/models/open_object_ui'
 
 #TODO implement passing session credentials to RPC methods (concurrent access of different user credentials in Rails)
 
@@ -52,7 +50,7 @@ class OpenObjectResource < ActiveResource::Base
       logger.info "registering #{model_class_name} as a Rails ActiveResource Model wrapper for OpenObject #{model_key} model"
       definition = "
       class #{model_class_name} < OpenObjectResource
-        self.site = '#{url || Ooor.object_url}'
+        self.site = '#{url || Ooor.base_url}'
         self.user = #{user_id}
         self.password = #{pass || false}
         self.openerp_database = '#{database}'
@@ -103,7 +101,7 @@ class OpenObjectResource < ActiveResource::Base
         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) }
+      try_with_pretty_error_log { 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)
@@ -120,7 +118,15 @@ class OpenObjectResource < ActiveResource::Base
         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) }
+      try_with_pretty_error_log { 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')
+      context = Ooor.global_context.merge(context)
+      unless wizard_id
+        wizard_id = try_with_pretty_error_log { 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
+      [wizard_id, try_with_pretty_error_log { 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, {'model' => @openerp_model, 'form' => form, 'id' => ids[0], 'report_type' => report_type, 'ids' => ids}, step, context) }]
     end
 
     #grab the eventual error log from OpenERP response as OpenERP doesn't enforce carefuly
@@ -140,6 +146,10 @@ class OpenObjectResource < ActiveResource::Base
         raise
     end
 
+    def method_missing(method_symbol, *arguments)
+      return self.rpc_execute(method_symbol.to_s, *arguments)
+    end
+
     def load_relation(model_key, ids, *arguments)
       options = arguments.extract_options!
       unless Ooor.all_loaded_models.index(model_key)
@@ -171,7 +181,7 @@ class OpenObjectResource < ActiveResource::Base
 
     #TODO, make sense?
     def find_one
-      raise "Not implemented yet, go one!"
+      raise "Not implemented yet, go on!"
     end
 
     # Find a single resource from the default URL
@@ -274,6 +284,11 @@ class OpenObjectResource < ActiveResource::Base
     load(self.class.find(self.id, :context => context).attributes)
   end
 
+  def old_wizard_step(wizard_name, step='init', wizard_id=nil, form={}, context={})
+    result = self.class.old_wizard_step(wizard_name, [self.id], step, wizard_id, form, {})
+    OpenObjectWizard.new(wizard_name, result[0], result[1], [self])
+  end
+
 
   # ******************** fake associations like much like ActiveRecord according to the cached OpenERP data model ********************
 

data/lib/app/models/open_object_ui.rb

@@ -0,0 +1,44 @@
+class OpenObjectLayoutedFields
+  attr_accessor :arch, :fields
+
+  def initialize(arch, fields)
+    @arch = arch
+    @fields = fields
+  end
+end
+
+class OpenObjectWizard < OpenObjectLayoutedFields
+  attr_accessor :name, :id, :datas, :arch, :fields, :type, :state, :open_object_resources
+
+  def initialize(name, id, data, open_object_resources)
+    super(data['arch'], data['fields'])
+    @name = name
+    @id = id
+    @open_object_resources = open_object_resources
+    @datas = data['datas'].symbolize_keys!
+    @type = data['type']
+    @state = data['state']
+  end
+
+  def method_missing(method_symbol, *arguments)
+    values = @datas.merge((arguments[0] || {}).symbolize_keys!)
+    context = Ooor.global_context.merge(arguments[1] || {})
+    if @open_object_resources.size == 1
+      open_object_resource = @open_object_resources[0]
+      data = open_object_resource.class.old_wizard_step(@name, [open_object_resource.id], method_symbol, @id, values, context)
+      if data[1]['state'] == 'end'
+        return open_object_resource.load(open_object_resource.class.find(open_object_resource.id, :context => context).attributes)
+      end
+      @arch = data[1]['arch']
+      @fields = data[1]['fields']
+      @datas = data[1]['datas'].symbolize_keys!
+      @type = data[1]['type']
+      @state = data[1]['state']
+      return self
+    else
+      ids = @open_object_resources.collect{|open_object_resources| open_object_resources.id}
+      return open_object_resource.class.old_wizard_step(@name, ids, method_symbol, @id, values, context)
+    end
+  end
+
+end

data/lib/ooor.rb

@@ -5,7 +5,7 @@ module Ooor
 
   class << self
 
-    attr_accessor :logger, :config, :all_loaded_models, :binding, :common_url, :object_url, :global_context
+    attr_accessor :logger, :config, :all_loaded_models, :binding, :base_url, :global_context
 
     #load the custom configuration
     def load_config(config_file=nil, env=nil)
@@ -28,7 +28,7 @@ module Ooor
       begin
       Ooor.config[:username] = user
       Ooor.config[:password] = password
-      client = OpenObjectResource.client(Ooor.common_url)
+      client = OpenObjectResource.client(Ooor.base_url + "/common")
       OpenObjectResource.try_with_pretty_error_log { client.call("login", Ooor.config[:database], user, password)}
       rescue SocketError => error
         Ooor.logger.error """login to OpenERP server failed:
@@ -42,8 +42,7 @@ module Ooor
       Ooor.config = config.is_a?(Hash) && config or keep_config && Ooor.config or self.load_config(config, env)
       Ooor.config.symbolize_keys!
       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.base_url = Ooor.config[:url].gsub(/\/$/,'')
       Ooor.global_context = Ooor.config[:global_context] || {}
       Ooor.config[:user_id] = global_login(Ooor.config[:username] || 'admin', Ooor.config[:password] || 'admin')
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
-  - Raphael Valyi - www.akretion.com
+- Raphael Valyi - www.akretion.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -02:00
+date: 2009-11-23 00:00:00 -02:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: activeresource
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.3.1
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: activeresource
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.1
+    version: 
 description: OOOR exposes business object proxies to your Ruby (Rails or not) application, that map seamlessly to your remote OpenObject/OpenERP server using webservices. It extends the standard ActiveResource API.
 email: rvalyi@akretion.com
 executables: []
@@ -31,12 +31,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - README.md
-  - MIT-LICENSE
-  - lib/ooor.rb
-  - lib/app/models/open_object_resource.rb
-  - lib/app/controllers/open_objects_controller.rb
-  - ooor.yml
+- README.md
+- MIT-LICENSE
+- lib/ooor.rb
+- lib/app/models/open_object_resource.rb
+- lib/app/models/open_object_ui.rb
+- lib/app/controllers/open_objects_controller.rb
+- ooor.yml
 has_rdoc: true
 homepage: http://github.com/rvalyi/ooor
 licenses: []
@@ -45,18 +46,18 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 requirements: []