ooor 1.3.2 → 1.4.0

data/lib/app/ui/client_base.rb

@@ -1,3 +1,20 @@
+#    OOOR: Open Object On Rails
+#    Copyright (C) 2009-2010 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/>.
+
 require 'app/ui/form_model'
 require 'app/ui/menu'
 require 'app/ui/action_window'

data/lib/app/ui/form_model.rb

@@ -1,3 +1,20 @@
+#    OOOR: Open Object On Rails
+#    Copyright (C) 2009-2010 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/>.
+
 class FormModel
   attr_accessor :name, :wizard_id, :datas, :arch, :fields, :type, :state, :view_id, :open_object_resources, :view_context
 

data/lib/app/ui/menu.rb

@@ -1,3 +1,20 @@
+#    OOOR: Open Object On Rails
+#    Copyright (C) 2009-2010 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/>.
+
 require 'app/ui/action_window'
 
 module MenuModule

data/lib/ooor.rb

@@ -1,8 +1,26 @@
+#    OOOR: Open Object On Rails
+#    Copyright (C) 2009-2010 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/>.
+
 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'
 require 'app/ui/client_base'
 
 class Ooor
@@ -29,7 +47,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) && $0 != 'irb' || config[:force_rails_logger]) ? Rails.logger : Logger.new(STDOUT))
+    @logger = ((defined?(Rails) && $0 != 'irb' || config[:force_rails_logger]) ? Rails.logger : Logger.new($stdout))
     @logger.level = config[:log_level] if config[:log_level]
     OpenObjectResource.logger = @logger
     @base_url = config[:url].gsub(/\/$/,'')
@@ -47,22 +65,18 @@ class Ooor
   def load_models(to_load_models=@config[:models])
     @global_context = @config[:global_context] || {}
     global_login(@config[:username] || 'admin', @config[:password] || 'admin')
-    @ir_model_class = define_openerp_model("ir.model", @config[:scope_prefix])
-    define_openerp_model("ir.model.fields", @config[:scope_prefix])
+    @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
-      models = @ir_model_class.find(:all, :domain => [['model', 'in', to_load_models]])
+      model_ids = @ir_model_class.search([['model', 'in', to_load_models]])
     else #we load all the models
-      models = @ir_model_class.find(:all).reject {|model| ["ir.model", "ir.model.fields"].index model.model}
+      model_ids = @ir_model_class.search() - [1, 2]
     end
+    models = @ir_model_class.read(model_ids, ['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])}
   end
 
-  def define_openerp_model(arg, scope_prefix=nil, url=nil, database=nil, user_id=nil, pass=nil)
-    if arg.is_a?(String) && arg != 'ir.model' && arg != 'ir.model.fields'
-      arg = @ir_model_class.find(:first, :domain => [['model', '=', arg]])
-    end
-    param = (arg.is_a? OpenObjectResource) ? arg.attributes.merge(arg.relations) : {'model' => arg}
+  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

data/ooor.yml

@@ -6,8 +6,7 @@ development:
   database: database_name                #the OpenERP database you want to connect to
   username: admin
   password: admin
-  #comment the following line if you want to load ALL the available models (slower startup), or complete it with all the OpenERP models you want to be loaded
-  models: [res.partner, product.template, product.product, product.category, sale.order, sale.order.line, account.invoice]
+  #models: [res.partner, product.template, product.product, product.category, sale.order, sale.order.line, account.invoice] #you can allow only some models if you like
   bootstrap: true   #true if you want to load OpenObject models (will hit OpenERP server) at startup; else use Ooor.reload!(lambda {}) to reload the Ooor models at any time
   #log_level: 0
   #global_context:
@@ -18,7 +17,6 @@ test:
   database: database_name
   username: admin
   password: admin
-  models: [res.partner, product.template, product.product, product.category, sale.order, sale.order.line, account.invoice]
   bootstrap: true
 
 production:
@@ -26,5 +24,4 @@ production:
   database: database_name
   username: admin
   password: admin
-  models: [res.partner, product.template, product.product, product.category, sale.order, sale.order.line, account.invoice]
   bootstrap: true

data/spec/ooor_spec.rb

@@ -101,6 +101,11 @@ describe Ooor do
         partners = ResPartner.find(:all, :params => {:supplier => true})
         partners.should_not be_empty
       end
+	
+      it "should mimic ActiveResource scoping with first" do
+        partner = ResPartner.find(:first, :params => {:customer => true})
+        partner.should be_kind_of ResPartner
+      end
 
       it "should support OpenERP context in finders" do
         p = ProductProduct.find(1, :context => {:my_key => 'value'})
@@ -136,12 +141,17 @@ describe Ooor do
       it "should read one2many relations" do
         o = SaleOrder.find(1)
         o.order_line.each do |line|
-          line.should be_kind_of(SaleOrderLine)
+        line.should be_kind_of(SaleOrderLine)
         end
       end
 
       it "should read many2many relations" do
-        SaleOrder.find(1).order_line[1].invoice_ids.should be_kind_of(Array)
+        s = SaleOrder.find(1)
+        s.order_policy = 'manual'
+        s.save
+        s.wkf_action('order_confirm')
+        s.wkf_action('manual_invoice')
+        SaleOrder.find(1).order_line[1].invoice_lines.should be_kind_of(Array)
       end
 
       it "should read polymorphic references" do
@@ -159,6 +169,23 @@ describe Ooor do
         p.categ_id.id.should == 1
       end
 
+      it "should support the context at object creation" do
+        p = ProductProduct.new({:name => "testProduct1", :categ_id => 1}, false, {:lang => 'en_US', :user_id=>1, :password => 'admin'})
+        p.object_session[:context][:lang] .should == 'en_US'
+        p.object_session[:user_id].should == 1
+        p.object_session[:password].should == "admin"
+        p.save
+      end
+
+      it "should support context when instanciating collections" do
+        products = ProductProduct.find([1, 2, 3], :context => {:lang => 'en_US', :user_id=>1, :password => 'admin'})
+        p = products[0]
+        p.object_session[:context][:lang] .should == 'en_US'
+        p.object_session[:user_id].should == 1
+        p.object_session[:password].should == "admin"
+        p.save
+      end
+
       it "should be able to create an order" do
         o = SaleOrder.create(:partner_id => ResPartner.search([['name', 'ilike', 'Agrolait']])[0], 
           :partner_order_id => 1, :partner_invoice_id => 1, :partner_shipping_id => 1, :pricelist_id => 1)
@@ -193,7 +220,8 @@ describe Ooor do
       end
 
       it "should skipped inherited default fields properly, for instance at product variant creation" do
-        ProductProduct.create(:product_tmpl_id => 25, :code => 'OOOR variant').should be_kind_of(ProductProduct)
+        #note that we force [] here for the default_get_fields otherwise OpenERP will blows up while trying to write in the product template!
+        ProductProduct.create({:product_tmpl_id => 25, :code => 'OOOR variant'}, {}, []).should be_kind_of(ProductProduct)
       end
     end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Raphael Valyi - www.akretion.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -03:00
+date: 2010-07-05 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,11 +41,12 @@ extra_rdoc_files: []
 
 files: 
 - README.md
-- MIT-LICENSE
+- agpl-3.0-licence.txt
 - lib/ooor.rb
 - ooor.yml
 - lib/app/models/open_object_resource.rb
 - lib/app/models/uml.rb
+- lib/app/models/base64.rb
 - lib/app/models/db_service.rb
 - lib/app/models/common_service.rb
 - lib/app/ui/action_window.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 [Raphaël Valyi]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.