ooor 1.6.5 → 1.7.0

data/lib/app/ui/action_window.rb

@@ -1,19 +1,8 @@
-#    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
   class ActionWindow
     class << self
@@ -43,10 +32,15 @@ module Ooor
         act_win_class
       end 
     
+      def get_url(mode='tree', id=nil, tab=nil) #TODO deal with visible tab in Javascript, possibly hacking web-client
+        url = "#{self.ooor.base_url.gsub("xmlrpc", "web/webclient/home")}#action_id=#{@openerp_act_window.id}&view_type=#{mode}"
+        url += "&id=#{id}" if id
+      end
+
       def get_view_id(mode)
-        IrActionsAct_window.read(@openerp_act_window.id, ["view_ids"])["view_ids"]
-        IrActionsAct_windowView.read([9,10], ["view_mode"]).each do |view_hash|
-          return view_hash["id"] if view_hash["view_mode"] == mode.to_s
+        ids = IrActionsAct_window.read(@openerp_act_window.id, ["view_ids"])["view_ids"]
+        IrActionsAct_windowView.read(ids, ["view_mode", "view_id"]).each do |view_hash|
+          return view_hash["view_id"][0] if view_hash["view_id"] && view_hash["view_mode"] == mode.to_s
         end
         IrUiView.search([['model', '=', act_window_param.openerp_model], ['type', '=', mode.to_s]])
       end
@@ -99,4 +93,4 @@ module Ooor
     
     
   end
-end
+end

data/lib/app/ui/client_base.rb

@@ -1,31 +1,14 @@
-#    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 'app/ui/form_model'
-require 'app/ui/menu'
 require 'app/ui/action_window'
 
 module Ooor
   module ClientBase
 
-    def menu_class
-      const_get('ir.ui.menu').send :include, MenuModule
-    end
-
     def get_init_menu(user_id=@config[:user_id])
       const_get('res.users').read([user_id], ['menu_id', 'name'], @global_context)
     end
@@ -50,4 +33,4 @@ module Ooor
       FormModel.new(view['name'], view['view_id'], view['arch'], view['fields'], nil, models, context, view['view_id'])
     end
   end
-end
+end

data/lib/app/ui/form_model.rb

@@ -1,19 +1,8 @@
-#    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
   class FormModel
     attr_accessor :name, :wizard_id, :datas, :arch, :fields, :type, :state, :view_id, :open_object_resources, :view_context

data/lib/ooor.rb

@@ -1,23 +1,10 @@
-#    OOOR: Open Object On Rails
-#    Copyright (C) 2009-2010 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 'logger'
 require 'app/models/open_object_resource'
-require 'app/models/uml'
 require 'app/models/db_service'
 require 'app/models/common_service'
 require 'app/models/base64'
@@ -27,9 +14,19 @@ module Ooor
   def self.new(*args)
     Ooor.send :new, *args
   end
+
+  def self.xtend(model_name, &block)
+    @extensions ||= {}
+    @extensions[model_name] ||= []
+    @extensions[model_name] << block
+    @extensions
+  end
+
+  def self.extensions
+    @extensions
+  end
   
   class Ooor
-    include UML
     include DbService
     include CommonService
     include ClientBase
@@ -91,43 +88,50 @@ module Ooor
     def load_models(to_load_models=@config[:models])
       @global_context = @config[:global_context] || {}
       global_login(@config[:username] || 'admin', @config[:password] || 'admin')
+      ([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])
       if to_load_models #we load only a customized subset of the OpenERP models
         model_ids = @ir_model_class.search([['model', 'in', to_load_models]])
-      else #we load all the models
-        model_ids = @config[:search_models] && @ir_model_class.search() - [1] || @config[:nb_models] || (501.times.map{|i| i}[2..500])
+      else
+        model_ids = @ir_model_class.search() - [1]
       end
       models = @ir_model_class.read(model_ids, ['model'])#['name', 'model', 'id', 'info', 'state'])#, 'field_id', 'access_ids'])
       @global_context.merge!({}).merge!(@config[:global_context] || {})
-      models.each {|openerp_model| define_openerp_model(openerp_model, @config[:scope_prefix])}
+      models.each {|openerp_model| define_openerp_model(openerp_model, @config[:scope_prefix], nil, nil, nil, nil, @config[:reload])}
     end
 
-    def define_openerp_model(param, scope_prefix=nil, url=nil, database=nil, user_id=nil, pass=nil)
-      klass = Class.new(OpenObjectResource)
-      klass.ooor = self
-      klass.site = url || @base_url
-      klass.user = user_id
-      klass.password = pass
-      klass.database = database
-      klass.openerp_model = param['model']
-      klass.openerp_id = url || param['id']
-      klass.info = (param['info'] || '').gsub("'",' ')
-      model_class_name = klass.class_name_from_model_key
-      klass.name = model_class_name
-      klass.state = param['state']
-      #klass.field_ids = param['field_id']
-      #klass.access_ids = param['access_ids']
-      klass.many2one_associations = {}
-      klass.one2many_associations = {}
-      klass.many2many_associations = {}
-      klass.polymorphic_m2o_associations = {}
-      klass.associations_keys = []
-      klass.fields = {}
-      klass.scope_prefix = scope_prefix
-      @logger.debug "registering #{model_class_name} as an ActiveResource proxy for OpenObject #{param['model']} model"
-      (scope_prefix ? Object.const_get(scope_prefix) : Object).const_set(model_class_name, klass)
-      @loaded_models.push(klass)
-      klass
+    def define_openerp_model(param, scope_prefix=nil, url=nil, database=nil, user_id=nil, pass=nil, reload=false)
+      model_class_name = OpenObjectResource.class_name_from_model_key(param['model'])
+      scope = scope_prefix ? Object.const_get(scope_prefix) : Object
+      if reload || !scope.const_defined?(model_class_name)
+        klass = Class.new(OpenObjectResource)
+        klass.ooor = self
+        klass.site = url || @base_url
+        klass.user = user_id
+        klass.password = pass
+        klass.database = database
+        klass.openerp_model = param['model']
+        klass.openerp_id = url || param['id']
+        klass.info = (param['info'] || '').gsub("'",' ')
+        klass.name = model_class_name
+        klass.state = param['state']
+        #klass.field_ids = param['field_id']
+        #klass.access_ids = param['access_ids']
+        klass.many2one_associations = {}
+        klass.one2many_associations = {}
+        klass.many2many_associations = {}
+        klass.polymorphic_m2o_associations = {}
+        klass.associations_keys = []
+        klass.fields = {}
+        klass.scope_prefix = scope_prefix
+        @logger.debug "registering #{model_class_name} as an ActiveResource proxy for OpenObject #{param['model']} model"
+        scope.const_set(model_class_name, klass)
+        (::Ooor.extensions[param['model']] || []).each {|block| klass.class_eval(&block)}
+        @loaded_models.push(klass)
+        return klass
+      else
+        return scope.const_get(model_class_name)
+      end
     end
   end
   

data/spec/ooor_spec.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
+
 require File.dirname(__FILE__) + '/../lib/ooor'
 
 #RSpec executable specification; see http://rspec.info/ for more information.
@@ -34,34 +39,30 @@ describe Ooor do
     end
 
     it "should be able to load a profile" do
-      accounting_module_ids = IrModuleModule.search(['|', ['name','=', 'account'], ['name','=', 'account_voucher']])
+      accounting_module_ids = IrModuleModule.search(['|', ['name','=', 'sale'], ['name','=', 'account_voucher']])
       accounting_module_ids.each do |accounting_module_id|
-        unless IrModuleModule.find(accounting_module_id).state == "installed"
-          conf1= BaseSetupConfig.create
-          conf1.config
-          conf2 = ResConfigView.create(:view => 'extended')
-          conf2.action_next
-          conf3 = BaseSetupCompany.create(:name => 'Akretion')
-          conf3.action_next
-          conf4 = BaseSetupInstaller.create(:sale => 1)
-          conf4.action_next
-          @ooor.load_models
-          config5 = AccountInstaller.create(:charts => 'configurable')
-          config5.action_next
-          @ooor.loaded_models.should_not be_empty
+        mod = IrModuleModule.find(accounting_module_id) 
+        unless mod.state == "installed"
+          mod.button_install
         end
       end
+      wizard = BaseModuleUpgrade.create
+      wizard.upgrade_module
+      @ooor.load_models
+#          config5 = AccountInstaller.create(:charts => 'configurable')
+#          config5.action_next
+      @ooor.loaded_models.should_not be_empty
     end
 
     it "should be able to configure the database" do
-	end
-	  if false
-      chart_module_id = IrModuleModule.search([['category_id', '=', 'Account Charts'], ['name','=', 'l10n_fr']])[0]
-      unless IrModuleModule.find(chart_module_id).state == "installed"
-        w2 = @ooor.const_get('account.config.wizard').create(:charts => chart_module_id)
-        w2.action_create
-        w3 = @ooor.const_get('wizard.multi.charts.accounts').create
-        w3.action_create
+#      chart_module_id = IrModuleModule.search([['category_id', '=', 'Account Charts'], ['name','=', 'l10n_fr']])[0]
+      if AccountTax.search.empty?
+        w1 = @ooor.const_get('account.installer').create(:charts => "configurable")
+        w1.action_next
+        w1 = @ooor.const_get('wizard.multi.charts.accounts').create(:charts => "configurable", :code_digits => 2)
+        w1.action_next
+#        w3 = @ooor.const_get('wizard.multi.charts.accounts').create
+#        w3.action_create
       end
     end
   end
@@ -111,8 +112,8 @@ describe Ooor do
         partners = ResPartner.find(:all, :params => {:supplier => true})
         partners.should_not be_empty
       end
-	
-      it "should mimic ActiveResource scoping with first" do
+
+      it "should mimic ActiveResource scopinging with first" do
         partner = ResPartner.find(:first, :params => {:customer => true})
         partner.should be_kind_of ResPartner
       end
@@ -133,7 +134,7 @@ describe Ooor do
         o = SaleOrder.find(1)
         o.date_order.should be_kind_of(Date)
         m = StockMove.find(1)
-        m.date.should be_kind_of(Time)
+        m.date.should be_kind_of(DateTime)
       end
 
       it "should be able to call any Class method" do
@@ -383,15 +384,15 @@ describe Ooor do
     end
 
     it "should accept rendering options" do
-      SaleOrder.print_uml(:all, :detailed).should be_true
+      SaleOrder.print_uml({:detailed => true}).should be_true
     end
   end
 
 
   describe "Multi-instance and class name scoping" do
     before(:all) do
-      @ooor1 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE1', :models => ['product.product'])
-      @ooor2 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE2', :models => ['product.product'])
+      @ooor1 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE1', :models => ['product.product'], :reload => true)
+      @ooor2 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE2', :models => ['product.product'], :reload => true)
     end
 
     it "should still be possible to find a ressource using an absolute id" do
@@ -405,4 +406,23 @@ describe Ooor do
     end
   end
 
-end
+
+  describe "Ruby OpenERP extensions" do
+    before(:all) do
+      @ooor = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :helper_paths => [File.dirname(__FILE__) + '/helpers/*'], :reload => true)
+    end
+
+    it "should have default core helpers loaded" do
+      mod = IrModuleModule.find(:first, :domain=>['name', '=', 'sale'])
+      mod.print_dependency_graph
+    end
+
+    it "should load custom helper paths" do
+      IrModuleModule.say_hello.should == "Hello"
+      mod = IrModuleModule.find(:first, :domain=>['name', '=', 'sale'])
+      mod.say_name.should == "sale"
+    end
+
+  end
+
+end

metadata

@@ -1,39 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ooor
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.7.0
   prerelease: 
-  version: 1.6.5
 platform: ruby
-authors: 
+authors:
 - Raphael Valyi - www.akretion.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-description: OOOR exposes business object proxies to your Ruby (Rails or not) application, that maps seamlessly to your remote OpenObject/OpenERP server using webservices. It extends the standard ActiveResource API. Running on JRuby, OOOR also offers a convenient bridge between OpenERP and the Java eco-system
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+description: OOOR exposes business object proxies to your Ruby (Rails or not) application,
+  that maps seamlessly to your remote OpenObject/OpenERP server using webservices.
+  It extends the standard ActiveResource API. Running on JRuby, OOOR also offers a
+  convenient bridge between OpenERP and the Java eco-system
 email: rvalyi@akretion.com
-executables: 
+executables:
 - ooor
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
-- agpl-3.0-licence.txt
+- MIT-LICENSE
 - lib/ooor.rb
 - ooor.yml
 - lib/app/models/open_object_resource.rb
@@ -48,35 +53,31 @@ files:
 - lib/app/ui/action_window.rb
 - lib/app/ui/client_base.rb
 - lib/app/ui/form_model.rb
-- lib/app/ui/menu.rb
+- lib/app/helpers/core_helpers.rb
 - spec/ooor_spec.rb
 - bin/ooor
 homepage: http://github.com/rvalyi/ooor
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OOOR - OpenObject On Ruby
 test_files: []
-