ooor 1.2.3 → 1.2.4

data/README.md

@@ -152,7 +152,7 @@ OpenERP context support (same as OpenERP):
 
 Request params or ActiveResource equivalence of OpenERP domain (but degraded as only the = operator is supported, else use domain):
 
-    $ Partners.find(:all, :params => {:supplier => true})
+    $ ResPartner.find(:all, :params => {:supplier => true})
 
 
 OpenERP search method:

data/lib/app/models/open_object_resource.rb

@@ -2,6 +2,7 @@ require 'xmlrpc/client'
 require 'active_resource'
 require 'app/models/open_object_ui'
 require 'app/models/uml'
+require 'set'
 
 #TODO implement passing session credentials to RPC methods (concurrent access of different user credentials in Rails)
 
@@ -73,10 +74,8 @@ 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}"
+      args[-1] = @ooor.global_context.merge(args[-1]) if args[-1].is_a? Hash
+      logger.debug "rpc_execute_with_all: rpc_method: '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.base_url) + "/object").call("execute",  db, uid, pass, obj, method, *args) }
     end
 
@@ -90,10 +89,8 @@ 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}"
+      args[-1] = @ooor.global_context.merge(args[-1]) if args[-1].is_a? Hash
+      logger.debug "rpc_execute_with_all: rpc_method: '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.base_url) + "/object").call("exec_workflow", db, uid, pass, obj, action, *args) }
     end
 
@@ -114,12 +111,14 @@ class OpenObjectResource < ActiveResource::Base
           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"]}
-            ***********"
+            #{openerp_error_hash["faultString"]}***********"
+            e.backtrace.each {|line| logger.error line if line.index("ooor")} and return nil
+          else
+            raise
           end
         rescue
+          raise
         end
-        raise
     end
 
     def method_missing(method_symbol, *arguments) self.rpc_execute(method_symbol.to_s, *arguments) end
@@ -171,6 +170,13 @@ class OpenObjectResource < ActiveResource::Base
       return active_resources
     end
 
+    #overriden because loading default fields is all the rage but we don't want them when reading a record
+    def instantiate_record(record, prefix_options = {})
+      new(record, [], {}).tap do |resource|
+        resource.prefix_options = prefix_options
+      end
+    end
+
   end
 
 
@@ -295,6 +301,20 @@ class OpenObjectResource < ActiveResource::Base
     @attributes.reject {|key, value| key == 'id'}.merge(@relations)
   end
 
+  #takes care of reading OpenERP default field values.
+  #FIXME: until OpenObject explicits inheritances, we load all default values of all related fields, unless specified in default_get_list
+  def initialize(attributes = {}, default_get_list=false, context={})
+    @attributes     = {}
+    @prefix_options = {}
+    if ['ir.model', 'ir.model.fields'].index(self.class.openerp_model) || default_get_list == []
+      load(attributes)
+    else
+      self.class.reload_fields_definition() unless self.class.fields_defined
+      default_get_list ||= Set.new(self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).fields.keys}.flatten + self.class.fields.keys).to_a
+      load(self.class.rpc_execute("default_get", default_get_list, context).merge(attributes))
+    end
+  end
+
   #compatible with the Rails way but also supports OpenERP context
   def create(context={})
     self.id = self.class.rpc_execute('create', to_openerp_hash!, context)
@@ -364,9 +384,16 @@ class OpenObjectResource < ActiveResource::Base
     is_assign = method_name.end_with?('=')
     method_key = method_name.sub('=', '')
     return super if attributes.has_key?(method_key)
-    
-    @relations[method_key] = arguments[0] and return if is_assign && self.class.relations_keys.index(method_key)
-    @attributes[method_key] = arguments[0] and return if is_assign && self.class.fields.keys.index(method_key)
+    return self.class.rpc_execute(method_name, *arguments) unless arguments.empty? || is_assign
+
+    self.class.reload_fields_definition() unless self.class.fields_defined
+
+    if is_assign
+      know_relations = self.class.relations_keys + self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).relations_keys}.flatten
+      @relations[method_key] = arguments[0] and return if know_relations.index(method_key)
+      know_fields = self.class.fields.keys + self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).fields.keys}.flatten
+      @attributes[method_key] = arguments[0] and return if know_fields.index(method_key)
+    end
 
     return @loaded_relations[method_name] if @loaded_relations.has_key?(method_name)
     return false if @relations.has_key?(method_name) and !@relations[method_name]
@@ -387,11 +414,13 @@ class OpenObjectResource < ActiveResource::Base
         @attributes[method_key] = arguments[0] and return if klazz.fields.keys.index(method_key)
       end
     end
+    super
 
-  rescue
+  rescue RuntimeError
+    raise
+  rescue NoMethodError
     display_available_fields
-
-    super
+    raise
   end
 
 end

data/lib/app/models/uml.rb

@@ -1,17 +1,16 @@
-require 'set'
-
 module UML
   #usage: UML.print_uml or with options: UML.print_uml(:all, : detailed) or MyOpenObjectResource.print_uml or UML.print_uml([list_of_classes], :all, :detailed)
 
   def self.included(base) base.extend(ClassMethods) end
 
   def print_uml(*options)
-    UML.print_uml(@config[:models] && @all_loaded_models.select {|model| @config[:models].index(model.openerp_model)} || @all_loaded_models, options)
+    ooor = self.class.ooor
+    UML.print_uml(ooor.config[:models] && ooor.all_loaded_models.select {|model| ooor.config[:models].index(model.openerp_model)} || ooor.all_loaded_models, options)
   end
 
   module ClassMethods
     def print_uml(*options)
-      UML.print_uml([self], options) if self.is_a?(OpenObjectResource)
+      UML.print_uml([self], options)
     end
   end
 

data/lib/ooor.rb

@@ -21,17 +21,16 @@ class Ooor
   end
 
   def global_login(user, password)
-    begin
     @config[:username] = user
     @config[:password] = password
     client = OpenObjectResource.client(@base_url + "/common")
     OpenObjectResource.try_with_pretty_error_log { client.call("login", @config[:database], user, password)}
-    rescue SocketError => error
+    rescue Exception => 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"}"""
-    end
+      raise
   end
 
   def initialize(config, env=false)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
-  - Raphael Valyi - www.akretion.com
+- Raphael Valyi - www.akretion.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -02:00
+date: 2010-02-04 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,13 +31,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - README.md
-  - MIT-LICENSE
-  - lib/ooor.rb
-  - lib/app/models/open_object_resource.rb
-  - lib/app/models/open_object_ui.rb
-  - lib/app/models/uml.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/models/uml.rb
+- ooor.yml
 has_rdoc: true
 homepage: http://github.com/rvalyi/ooor
 licenses: []
@@ -46,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: []