ooor 1.2.7 → 1.2.8

data/lib/app/models/open_object_resource.rb

@@ -46,6 +46,13 @@ class OpenObjectResource < ActiveResource::Base
           end
         end
         @relations_keys = @many2one_relations.merge(@one2many_relations).merge(@many2many_relations).keys
+        (@fields.keys + @relations_keys).each do |meth| #generates method handlers for autompletion tools such as jirb_swing
+          self.instance_eval do
+            define_method meth do |*args|
+              self.send :method_missing, *[meth, *args]
+            end
+          end
+        end
         logger.info "#{fields.size} fields loaded in model #{self.class}"
       end
       @fields_defined = true
@@ -131,7 +138,9 @@ class OpenObjectResource < ActiveResource::Base
 
     def cast_request_to_openerp!(map)
       map.each do |k, v|
-        if !v.is_a?(Integer) && !v.is_a?(Float) && v.is_a?(Numeric) && v.respond_to?(:to_f)
+        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}"
@@ -190,9 +199,6 @@ class OpenObjectResource < ActiveResource::Base
       !ids.empty? && ids[0].is_a?(Integer) && find_single(ids, options) || []
     end
 
-    #TODO, makes sense?
-    def find_one; raise"Not implemented yet, go on!"; end
-
     # Find a single resource from the default URL
     def find_single(scope, options)
       fields = options[:fields] || []
@@ -205,7 +211,7 @@ class OpenObjectResource < ActiveResource::Base
           tab = item.split(".")
           domain = [['name', '=', tab[-1]]]
           domain += [['module', '=', tab[-2]]] if tab[-2]
-          ir_model_data = IrModelData.find(:first, :domain => domain)
+          ir_model_data = const_get('ir.model.data').find(:first, :domain => domain)
           ir_model_data && ir_model_data.res_id && search([['id', '=', ir_model_data.res_id]])[0]
         else
           item
@@ -296,7 +302,7 @@ class OpenObjectResource < ActiveResource::Base
             resource = find_or_create_resource_for(key) #TODO check!
             @attributes[skey] = resource@attributes[skey].new(value)
           else
-            @attributes[skey] = value.dup rescue value
+            @attributes[skey] = value
         end
       end
     end
@@ -310,18 +316,13 @@ class OpenObjectResource < ActiveResource::Base
   end
 
   def display_available_fields
-    self.class.logger.debug ""
-    self.class.logger.debug "*** DIRECTLY AVAILABLE FIELDS ON OBJECT #{self} ARE: ***\n"
-    self.class.fields.sort {|a,b| a[1].ttype<=>b[1].ttype}.each {|i| self.class.logger.debug "#{i[1].ttype} --- #{i[0]}"}
-    self.class.logger.debug ""
-    self.class.many2one_relations.each {|k, v| self.class.logger.debug "many2one --- #{v.relation} --- #{k}"}
-    self.class.logger.debug ""
-    self.class.one2many_relations.each {|k, v| self.class.logger.debug "one2many --- #{v.relation} --- #{k}"}
-    self.class.logger.debug ""
-    self.class.many2many_relations.each {|k, v| self.class.logger.debug "many2many --- #{v.relation} --- #{k}"}
-    self.class.logger.debug ""
-    self.class.logger.debug "YOU CAN ALSO USE THE INHERITED FIELDS FROM THE INHERITANCE MANY2ONE RELATIONS OR THE OBJECT METHODS..."
-    self.class.logger.debug ""
+    msg = "\n*** DIRECTLY AVAILABLE FIELDS ON OBJECT #{self} ARE: ***"
+    msg << "\n\n" << self.class.fields.sort {|a,b| a[1].ttype<=>b[1].ttype}.map {|i| "#{i[1].ttype} --- #{i[0]}"}.join("\n")
+    msg << "\n\n" << self.class.many2one_relations.map {|k, v| "many2one --- #{v.relation} --- #{k}"}.join("\n")
+    msg << "\n\n" << self.class.one2many_relations.map {|k, v| "one2many --- #{v.relation} --- #{k}"}.join("\n")
+    msg << "\n\n" << self.class.many2many_relations.map {|k, v| "many2many --- #{v.relation} --- #{k}"}.join("\n")
+    msg << "\n\nYOU CAN ALSO USE THE INHERITED FIELDS FROM THE INHERITANCE MANY2ONE RELATIONS OR THE OBJECT METHODS...\n\n"
+    self.class.logger.debug msg
   end
 
   def to_openerp_hash!
@@ -340,7 +341,7 @@ class OpenObjectResource < ActiveResource::Base
     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))
+      load(self.class.rpc_execute("default_get", default_get_list, context).symbolize_keys!.merge(attributes.symbolize_keys!))
     end
   end
 

data/lib/ooor.rb

@@ -36,7 +36,7 @@ class Ooor
   def initialize(config, env=false)
     @config = config.is_a?(String) ? Ooor.load_config(config, env) : config
     @config.symbolize_keys!
-    @logger = ((defined?(RAILS_ENV) and RAILS_ENV != "development") ? Rails.logger : Logger.new(STDOUT))
+    @logger = ((defined?(RAILS_ENV) && $0 != 'irb') ? Rails.logger : Logger.new(STDOUT))
     @logger.level = config[:log_level] if config[:log_level]
     @base_url = config[:url].gsub(/\/$/,'')
     @global_context = config[:global_context] || {}
@@ -54,7 +54,7 @@ class Ooor
     if config[:models] #we load only a customized subset of the OpenERP models
       models = @ir_model_class.find(:all, :domain => [['model', 'in', config[:models]]])
     else #we load all the models
-      models = @ir_model_class.find(:all).reject {|model| model.model == "ir.model" || model.model == "ir.model.fields"}
+      models = @ir_model_class.find(:all).reject {|model| ["ir.model", "ir.model.fields", "ir.model.data"].index model.model}
     end
     models.each {|openerp_model| define_openerp_model(openerp_model, nil, nil, nil, nil, config[:scope_prefix])}
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ooor
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Raphael Valyi - www.akretion.com
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -03:00
+date: 2010-03-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 1
         version: 2.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 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: []
@@ -51,18 +60,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: OOOR - OpenObject On Rails