ooor 1.9.0 → 1.9.1

data/lib/app/models/open_object_resource.rb

@@ -24,10 +24,19 @@ module Ooor
     class << self
 
       cattr_accessor :logger
-      attr_accessor :openerp_id, :info, :access_ids, :name, :openerp_model, :field_ids, :state, #model class attributes associated to the OpenERP ir.model
+      attr_accessor :openerp_id, :info, :access_ids, :name, :description, :openerp_model, :field_ids, :state, #class attributes associated to the OpenERP ir.model
                     :fields, :fields_defined, :many2one_associations, :one2many_associations, :many2many_associations, :polymorphic_m2o_associations, :associations_keys,
                     :database, :user_id, :scope_prefix, :ooor, :association
 
+      def model_name
+        @_model_name ||= begin
+          namespace = self.parents.detect do |n|
+            n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+          end
+          ActiveModel::Name.new(self, namespace, description)
+        end
+      end
+
       def print_uml(options={})
         UML.print_uml([self], options)
       end
@@ -231,9 +240,10 @@ module Ooor
 
       #actually finds many resources specified with scope = ids_array
       def find_single(scope, options)
+        context = options[:context] || {}
+        reload_fields_definition(false, context)
         all_fields = @fields.merge(@many2one_associations).merge(@one2many_associations).merge(@many2many_associations).merge(@polymorphic_m2o_associations)
         fields = options[:fields] || options[:only] || all_fields.keys.select {|k| all_fields[k]["type"] != "binary" && (options[:include_functions] || !all_fields[k]["function"])}
-        context = options[:context] || {}
 #        prefix_options, query_options = split_options(options[:params])
         is_collection = true
         scope = [scope] and is_collection = false if !scope.is_a? Array
@@ -292,33 +302,34 @@ module Ooor
       self.class.rpc_execute_with_all(object_db, object_uid, object_pass, self.class.openerp_model, method, *args)
     end
 
-    def reload_from_record!(record) load(record.attributes, record.associations) end
+    def reload_from_record!(record) load(record.attributes.merge(record.associations)) end
 
-    def load(attributes, associations={})#an attribute might actually be a association too, will be determined here
+    def load(attributes, remove_root=false)#an attribute might actually be a association too, will be determined here
       self.class.reload_fields_definition(false, object_session)
       raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
       @prefix_options, attributes = split_options(attributes)
-      @associations = associations
-      @attributes = {}
+      @associations ||= {}
+      @attributes ||= {}
       @loaded_associations = {}
       attributes.each do |key, value|
         skey = key.to_s
-        if self.class.associations_keys.index(skey) || value.is_a?(Array)
-          associations[skey] = value #the association because we want the method to load the association through method missing
+        if self.class.associations_keys.index(skey) || value.is_a?(Array) #FIXME may miss m2o with inherits!
+          @associations[skey] = value #the association because we want the method to load the association through method missing
         else
-          @attributes[skey] = value
+          @attributes[skey] = (value == false)? nil : value
         end
       end
       self
     end
 
     def available_fields
-      msg = "\n*** AVAILABLE FIELDS ON OBJECT #{self.class.name} ARE: ***"
+      msg = "\n*** AVAILABLE FIELDS ON #{self.class.name} ARE: ***"
       msg << "\n\n" << self.class.fields.sort {|a,b| a[1]['type']<=>b[1]['type']}.map {|i| "#{i[1]['type']} --- #{i[0]}"}.join("\n")
-      msg << "\n\n" << self.class.many2one_associations.map {|k, v| "many2one --- #{v['relation']} --- #{k}"}.join("\n")
-      msg << "\n\n" << self.class.one2many_associations.map {|k, v| "one2many --- #{v['relation']} --- #{k}"}.join("\n")
-      msg << "\n\n" << self.class.many2many_associations.map {|k, v| "many2many --- #{v['relation']} --- #{k}"}.join("\n")
-      msg << "\n\n" << self.class.polymorphic_m2o_associations.map {|k, v| "polymorphic_m2o --- #{v['relation']} --- #{k}"}.join("\n")
+      %w[many2one one2many many2many polymorphic_m2o].each do |kind|
+        msg << "\n\n"
+        msg << (self.class.send "#{kind}_associations").map {|k, v| "{kind} --- #{v['relation']} --- #{k}"}.join("\n")
+      end
+      msg
     end
 
     #takes care of reading OpenERP default field values.
@@ -381,7 +392,7 @@ module Ooor
         self.class.logger.info result["warning"]["title"]
         self.class.logger.info result["warning"]["message"]
       end
-      load(@attributes.merge({field_name => field_value}).merge(result["value"]), @associations)
+      load(@attributes.merge({field_name => field_value}).merge(result["value"]))
     end
 
     #wrapper for OpenERP exec_workflow Business Process Management engine
@@ -468,7 +479,7 @@ module Ooor
     end
 
     def reload_fields(context)
-      records = self.class.find(self.id, :context => context, :fields => @attributes.keys)
+      records = self.class.find(self.id, :context => context, :fields => @attributes.keys + @associations.keys)
       reload_from_record!(records)
     end
   end

data/lib/ooor.rb

@@ -98,7 +98,7 @@ module Ooor
       ([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])
       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'])
+      models = @ir_model_class.read(model_ids, ['model', 'name'])#['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
@@ -117,6 +117,7 @@ module Ooor
         klass.openerp_id = url || param['id']
         klass.info = (param['info'] || '').gsub("'",' ')
         klass.name = model_class_name
+        klass.description = param['name']
         klass.state = param['state']
         #klass.field_ids = param['field_id']
         #klass.access_ids = param['access_ids']

data/spec/ooor_spec.rb

@@ -9,7 +9,7 @@ require File.dirname(__FILE__) + '/../lib/ooor'
 #Run the file with the rspec command  from the rspec gem
 describe Ooor do
   before(:all) do
-    @url = 'http://localhost:8069/xmlrpc'
+    @url = 'http://localhost:8169/xmlrpc'
     @db_password = 'admin'
     @username = 'admin'
     @password = 'admin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooor
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource