ooor 1.6.5 → 1.7.0

data/lib/app/models/base64.rb

@@ -1,31 +1,20 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
+
+autoload :Base64, 'base64'
 
-require 'base64'
 module Base64
   def serialize_binary_from_file(binary_path)
-		return Base64.encode64(File.read(binary_path))
-	end
+    return Base64.encode64(File.read(binary_path))
+  end
 
-	def serialize_binary_from_content(content)
-		return Base64.encode64(content)
-	end
+  def serialize_binary_from_content(content)
+    return Base64.encode64(content)
+  end
 
-	def unserialize_binary(content)
-		return Base64.decode64(content)
-	end
-end
+  def unserialize_binary(content)
+    return Base64.decode64(content)
+  end
+end

data/lib/app/models/common_service.rb

@@ -1,19 +1,7 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
 
 #proxies all 'common' class of OpenERP server/bin/service/web_service.py properly
 module Ooor

data/lib/app/models/db_service.rb

@@ -1,19 +1,7 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
 
 #proxies all 'db' class of OpenERP server/bin/service/web_service.py properly
 module Ooor
@@ -23,7 +11,8 @@ module Ooor
       @config[:database] = db_name
       @config[:username] = 'admin'
       @config[:passowrd] = user_password
-      while get_progress('admin', process_id) == [0, []]
+      sleep(3)
+      while get_progress('admin', process_id)[0] != 1
         @logger.info "..."
         sleep(0.5)
       end
@@ -43,4 +32,4 @@ module Ooor
       end
     end
   end
-end
+end

data/lib/app/models/ooor_client.rb

@@ -1,19 +1,7 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
 
 require 'xmlrpc/client'
 

data/lib/app/models/open_object_resource.rb

@@ -1,19 +1,7 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
 
 require 'rubygems'
 require 'active_resource'
@@ -23,11 +11,12 @@ require 'app/models/type_casting'
 require 'app/models/relation'
 require 'app/models/serialization'
 
+autoload :UML, 'app/models/uml'
+
 module Ooor
   class OpenObjectResource < ActiveResource::Base
     #PREDEFINED_INHERITS = {'product.product' => 'product_tmpl_id'}
     #include ActiveModel::Validations
-    include UML
     include TypeCasting
     include Serialization
 
@@ -39,6 +28,10 @@ module Ooor
                     :fields, :fields_defined, :many2one_associations, :one2many_associations, :many2many_associations, :polymorphic_m2o_associations, :associations_keys,
                     :database, :user_id, :scope_prefix, :ooor, :association
 
+      def print_uml(options={})
+        UML.print_uml([self], options)
+      end
+
       def class_name_from_model_key(model_key=self.openerp_model)
         model_key.split('.').collect {|name_part| name_part.capitalize}.join
       end
@@ -159,7 +152,7 @@ module Ooor
 
       def old_wizard_step(wizard_name, ids, step='init', wizard_id=nil, form={}, context={}, report_type='pdf')
         context = @ooor.global_context.merge(context)
-        cast_request_to_openerp!(form)
+        cast_map_to_openerp!(form)
         unless wizard_id
           logger.debug "OOOR RPC: 'create old_wizard_step' #{wizard_name}"
           wizard_id = cast_answer_to_ruby!(@ooor.get_rpc_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))
@@ -213,7 +206,19 @@ module Ooor
         return nil
       end
 
-      # ******************** finders low level implementation ********************
+      def find(*arguments)
+        scope   = arguments.slice!(0)
+        options = arguments.slice!(0) || {}
+        case scope
+          when :all   then find_every(options)
+          when :first then find_every(options.merge(:limit => 1)).first
+          when :last  then find_every(options).last
+          when :one   then find_one(options)
+          else             find_single(scope, options)
+        end
+      end
+
+      #******************** finders low level implementation ********************
       private
 
       def find_every(options)
@@ -250,7 +255,7 @@ module Ooor
           record.each_pair do |k,v|
             r[k.to_sym] = v
           end
-          active_resources << instantiate_record(r, {}, context)
+          active_resources << new(r, [], context, true)
         end
         unless is_collection
           return active_resources[0]
@@ -258,13 +263,6 @@ module Ooor
         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 = {}, context = {})
-        new(record, [], context, true).tap do |resource|
-          resource.prefix_options = prefix_options
-        end
-      end
-
     end
 
     self.name = "OpenObjectResource"
@@ -307,24 +305,12 @@ module Ooor
         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
         else
-          case value
-            when Hash
-              resource = find_or_create_resource_for(key) #TODO check!
-              @attributes[skey] = resource@attributes[skey].new(value)
-            else
-              @attributes[skey] = value
-          end
+          @attributes[skey] = value
         end
       end
       self
     end
 
-    def load_association(model_key, ids, *arguments)
-      options = arguments.extract_options!
-      related_class = self.class.const_get(model_key, object_session)
-      related_class.send :find, ids, :fields => options[:fields] || options[:only] || [], :context => options[:context] || object_session
-    end
-
     def available_fields
       msg = "\n*** AVAILABLE FIELDS ON OBJECT #{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")
@@ -369,10 +355,11 @@ module Ooor
     #compatible with the Rails way but also supports OpenERP context
     def update(context={}, reload=true)
       rpc_execute('write', [self.id], to_openerp_hash!, context)
-      reload_from_record!(self.class.find(self.id, :context => context)) if reload
+      reload_fields(context) if reload
       @persisted = true
     end
 
+
     #compatible with the Rails way but also supports OpenERP context
     def destroy(context={})
       rpc_execute('unlink', [self.id], context)
@@ -399,7 +386,7 @@ module Ooor
     #wrapper for OpenERP exec_workflow Business Process Management engine
     def wkf_action(action, context={}, reload=true)
       self.class.rpc_exec_workflow_with_all(object_db, object_uid, object_pass, self.class.openerp_model, action, self.id) #FIXME looks like OpenERP exec_workflow doesn't accept context but it might be a bug
-      reload_from_record!(self.class.find(self.id, :context => context)) if reload
+      reload_fields(context) if reload
     end
 
     def old_wizard_step(wizard_name, step='init', wizard_id=nil, form={}, context={})
@@ -471,5 +458,17 @@ module Ooor
       self.class.get_report_data(report_name, [self.id], report_type, context)        
     end 
 
+    private
+    
+    def load_association(model_key, ids, *arguments)
+      options = arguments.extract_options!
+      related_class = self.class.const_get(model_key, object_session)
+      related_class.send :find, ids, :fields => options[:fields] || options[:only] || [], :context => options[:context] || object_session
+    end
+
+    def reload_fields(context)
+      records = self.class.find(self.id, :context => context, :fields => @attributes.keys)
+      reload_from_record!(records)
+    end
   end
 end

data/lib/app/models/relation.rb

@@ -1,19 +1,7 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
 
 #TODO chainability of where via scopes
 #TODO include relations for single read
@@ -142,4 +130,4 @@ module Ooor
     end
 
   end
-end
+end

data/lib/app/models/serialization.rb

@@ -1,3 +1,8 @@
+#    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
+
 module Ooor
   module Serialization
 

data/lib/app/models/type_casting.rb

@@ -1,3 +1,8 @@
+#    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
+
 module Ooor
   module TypeCasting
   
@@ -37,9 +42,9 @@ module Ooor
         elsif !v.is_a?(Integer) && !v.is_a?(Float) && v.is_a?(Numeric) && v.respond_to?(:to_f)
           return 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
-          return "#{v.year}-#{v.month}-#{v.day} #{v.hour}:#{v.min}:#{v.sec}"
+          return "%d-%02d-%02d %02d:%02d:%02d" % [v.year, v.month, v.day, v.hour, v.min, v.sec]
         elsif !v.is_a?(Numeric) && !v.is_a?(Integer) && v.respond_to?(:day) && v.respond_to?(:year)#really ensure that's a date type
-          return "#{v.year}-#{v.month}-#{v.day}"
+          return "%d-%02d-%02d" % [v.year, v.month, v.day]
         elsif v == "false" #may happen with OOORBIT
           return false
         else
@@ -59,7 +64,7 @@ module Ooor
             if self.fields[k] && v.is_a?(String) && !v.empty?
               case self.fields[k]['type']
               when 'datetime'
-                map[k] = Time.parse(v)
+                map[k] = DateTime.parse(v)
               when 'date'
                 map[k] = Date.parse(v)
               end

data/lib/app/models/uml.rb

@@ -1,31 +1,18 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2011 Akretion LTDA (<http://www.akretion.com>).
+#    OOOR: OpenObject On Ruby
+#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    Licensed under the MIT license, see MIT-LICENSE file
+
 module Ooor
   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)
+    def print_uml(options={})
       ooor = self.class.ooor
       UML.print_uml(ooor.config[:models] && ooor.loaded_models.select {|model| ooor.config[:models].index(model.openerp_model)} || ooor.loaded_models, options)
     end
 
-    def serve_uml(*options)#TODO port
+    def serve_uml(options={})#TODO port
       ooor = self
       require 'sinatra'
       set :public, File.dirname(__FILE__) + '/../../'
@@ -44,12 +31,6 @@ module Ooor
       Sinatra::Application.run!
     end
 
-    module ClassMethods
-      def print_uml(*options)
-        UML.print_uml([self], options)
-      end
-    end
-
     def self.display_fields(clazz)
       s = ""
       clazz.reload_fields_definition if clazz.fields.empty?
@@ -58,12 +39,20 @@ module Ooor
       s
     end
 
-    def self.print_uml(classes, *options)
-      options = options[0] if options[0].is_a?(Array)
-      local = (options.index(:all) == nil)
-      detailed = (options.index(:detailed) != nil) || local && (options.index(:nodetail) == nil)
+    def self.print_uml(classes, options={})
+#      options = options[0] if options[0].is_a?(Array)
+#      local = (options.index(:all) == nil)
+#      detailed = (options.index(:detailed) != nil) || local && (options.index(:nodetail) == nil)
+      return if classes.empty?
+      local = true
+      detailed = true
+      file_name = options[:file_name] || classes[0].name
+      if classes.size > 8
+        enabled_targets = classes.map {|i| i.openerp_model} #classes[0].ooor.config[:models] #defines the scope of the UML for option local
+      else
+        enabled_targets = classes[0].ooor.config[:models] #defines the scope of the UML for option local
+      end
 
-      enabled_targets = classes[0].ooor.config[:models] #defines the scope of the UML for option local
       m2o_edges = {}
       o2m_edges = {}
       m2m_edges = {}
@@ -73,11 +62,13 @@ module Ooor
       #back links from connex classes:
       connex_classes += UML.collect_edges(true, local, connex_classes - classes, classes, m2o_edges, o2m_edges, m2m_edges)
 
-      File.open('uml.dot', 'w') do |f|
+      File.open("#{file_name}.dot", 'w') do |f|
         f << <<-eos
         digraph UMLbyOOOR {
             fontname = "Helvetica"
+            #{classes.size < 5 && "layout = fdp" || ""}
             fontsize = 11
+            splines = polyline
             label = "*** generated by OOOR by www.akretion.com ***"
             node [
                     fontname = "Helvetica"
@@ -96,7 +87,7 @@ module Ooor
         #UML nodes definitions
         ((connex_classes - classes) + classes - [IrModel, IrModel.const_get('ir.model.fields')]).each do |model|
           #f << " #{model} [ label = \"{#{model.name}#{detailed ? '|' + display_fields(model) : ''}}\" URL=\"/model/#{model.openerp_model}\"];\n"
-      f << "#{model}[label=<<TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\" BGCOLOR=\"#ffffff\"><TR><TD COLSPAN=\"3\" BGCOLOR=\"#9bab96\" ALIGN=\"CENTER\">#{model.name}</TD></TR>#{display_fields(model)}</TABLE>> URL=\"/model/#{model.openerp_model}\"];\n"
+      f << "#{model}[label=<<TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\" BGCOLOR=\"#ffffff\"><TR><TD COLSPAN=\"3\" BGCOLOR=\"#9bab96\" ALIGN=\"CENTER\">#{model.name}</TD></TR>#{(classes.index(model) || classes.size == 1) && display_fields(model) || ''}</TABLE>> URL=\"/model/#{model.openerp_model}\"];\n"
         end
 
         #many2one:
@@ -141,12 +132,12 @@ module Ooor
       end
 
       begin
-        cmd_line1 = "rm  uml.png"
+        cmd_line1 = "rm  #{file_name}.png"
         #system(cmd_line1)
       rescue
       end
       #cmd_line2 = "dot -Tpng uml.dot -o uml.png"
-      cmd_line2 = "dot -Tcmapx -ox.map -Tpng -ox.png uml.dot"
+      cmd_line2 = "dot -Tcmapx -o#{file_name}.map -Tpng -o#{file_name}.png #{file_name}.dot"
       system(cmd_line2)
     end
 
@@ -216,4 +207,4 @@ module Ooor
       end
     end
   end
-end
+end