ooor 2.0.4 → 2.0.5

data/lib/ooor/version.rb

@@ -1,7 +1,7 @@
 module Ooor
   MAJOR = 2
   MINOR = 0
-  TINY  = 4
+  TINY  = 5
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, TINY].compact.join('.')

data/spec/ooor_spec.rb

@@ -1,5 +1,5 @@
 #    OOOR: OpenObject On Ruby
-#    Copyright (C) 2009-2012 Akretion LTDA (<http://www.akretion.com>).
+#    Copyright (C) 2009-2014 Akretion LTDA (<http://www.akretion.com>).
 #    Author: Raphaël Valyi
 #    Licensed under the MIT license, see MIT-LICENSE file
 
@@ -65,9 +65,10 @@ describe Ooor do
 
     describe "Finders operations" do
       it "should be able to find data by id" do
-        product1 = ProductProduct.find(1)
+        first_product_id = ProductProduct.search([], 0, 1).first
+        product1 = ProductProduct.find(first_product_id)
         expect(product1).not_to be_nil
-        expect(ProductProduct.find(:first).attributes).to eq product1.attributes
+        product1.attributes.should be_kind_of(Hash)
       end
 
       it "fetches data given an array of ids" do
@@ -76,7 +77,7 @@ describe Ooor do
       end
 
       it "should fetches data given an implicit array of ids" do
-        products = ProductProduct.find(1,2)
+        products = ProductProduct.find(1, 2)
         products.size.should == 2
       end
       
@@ -143,19 +144,20 @@ describe Ooor do
         partner.should be_kind_of ResPartner
       end
 
-      it "should support OpenERP context in finders" do
-        p = ProductProduct.find(1, :context => {:my_key => 'value'})
-        p.should_not be_nil
-        products = ProductProduct.find(:all, :context => {:lang => 'es_ES'})
-        products.should be_kind_of(Array)
-      end
+#      NOTE: in Ooor 2.1 we don't support this anymore, use session.with_context(context) {} instead
+#      it "should support OpenERP context in finders" do #TODO
+#        p = ProductProduct.find(1, :context => {:my_key => 'value'})
+#        p.should_not be_nil
+#        products = ProductProduct.find(:all, :context => {:lang => 'es_ES'})
+#        products.should be_kind_of(Array)
+#      end
 
-      it "should support writing with a context" do
-        p = ProductProduct.find(1, fields: ['name'])
-        ProductProduct.write(1, {name: p.name}, {lang: 'en_US'})
-        ProductProduct.write(1, {name: p.name}, lang: 'en_US')
-        p.write({name: p.name}, lang: 'en_US')
-      end
+#      it "should support writing with a context" do #TODO
+#        p = ProductProduct.find(1, fields: ['name'])
+#        ProductProduct.write(1, {name: p.name}, {lang: 'en_US'})
+#        ProductProduct.write(1, {name: p.name}, lang: 'en_US')
+#        p.write({name: p.name}, lang: 'en_US')
+#      end
 
       it "should support OpenERP search method" do
         partners = ResPartner.search([['name', 'ilike', 'a']], 0, 2)
@@ -170,7 +172,7 @@ describe Ooor do
       end
 
       it "should not load false values in empty strings (for HTML forms)" do
-        ResPartner.first.phone.should be_nil
+        ResPartner.first.mobile.should be_nil
       end
 
       it "should map OpenERP types to Rails types" do
@@ -184,26 +186,26 @@ describe Ooor do
 
     describe "Relations reading" do
       it "should read many2one relations" do
-        o = SaleOrder.find(1)
+        o = SaleOrder.find(:first)
         o.partner_id.should be_kind_of(ResPartner)
         p = ProductProduct.find(1) #inherited via product template
         p.categ_id.should be_kind_of(ProductCategory)
       end
 
       it "should read one2many relations" do
-        o = SaleOrder.find(1)
+        o = SaleOrder.find(:first)
         o.order_line.each do |line|
         line.should be_kind_of(SaleOrderLine)
         end
       end
 
       it "should read many2many relations" do
-        s = SaleOrder.find(1)
+        s = SaleOrder.find(:first)
         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)
+        SaleOrder.find(:first).order_line[1].invoice_lines.should be_kind_of(Array)
       end
 
       it "should read polymorphic references" do
@@ -279,19 +281,19 @@ describe Ooor do
 
       it "should skipped inherited default fields properly, for instance at product variant creation" do
         #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)
+        ProductProduct.create({:product_tmpl_id => 25, :code => 'OOOR variant'}, []).should be_kind_of(ProductProduct)
       end
     end
 
     describe "Basic updates" do
       it "should cast properly from Ruby to OpenERP" do
-        o = SaleOrder.find(1).copy()
+        o = SaleOrder.find(:first).copy()
         o.date_order = 2.days.ago
         o.save
       end
 
       it "should be able to reload resource" do
-        s = SaleOrder.find(1)
+        s = SaleOrder.find(:first)
         s.reload.should be_kind_of(SaleOrder)
       end
     end
@@ -343,8 +345,7 @@ describe Ooor do
 
       it "should support Rails nested attributes methods" do
         so = SaleOrder.find :first
-        so.respond_to?(:order_line_attributes).should be_true
-        so.respond_to?(:order_line_attributes=).should be_true
+        so.respond_to?(:order_line_attributes=).should == true
       end
 
       it "should support CRUD on o2m via nested attributes" do
@@ -354,7 +355,7 @@ describe Ooor do
         p = ProductProduct.find p.id
         pack1 = p.packaging[0]
         pack2 = p.packaging[1]
-        pack2.name.should == 'pack2'
+        pack2.name.index('pack').should == 0
         p.packaging_attributes = {'1' => {name: 'pack1', '_destroy'=> true, id: pack1.id}, '2' => {name: 'pack2_modified', id: pack2.id}}
         p.save
         p.packaging.size.should == 1
@@ -398,18 +399,39 @@ describe Ooor do
       include Ooor
 
       it "should call customized before_save callback" do
-        expect do
-          Ooor.xtend('ir.ui.menu') do
-            before_save do
-              raise 'before_save_called'
-            end
+        probe = nil
+        Ooor.xtend('ir.ui.menu') do
+          before_save do |record|
+            probe = record.name
           end
+        end
+
+        with_ooor_session username: 'admin', password: 'admin' do |session|
+          menu = session['ir.ui.menu'].first
+          menu.save
+          probe.should == menu.name
+        end
+      end
+
+      it "should call customized before_save callback on nested o2m" do
+        with_ooor_session({username: 'admin', password: 'admin'}, 'noshare1') do |session|
+          # we purposely make reflections happen to ensure they won't be reused in next session
+          p = session['product.product'].create name: 'noise', packaging_attributes: {'1' => {name: 'pack'}}
+        end
 
-          with_ooor_session username: 'demo', password: 'demo' do |session|
-            session['ir.ui.menu'].first.save
+        probe = nil
+        Ooor.xtend('product.packaging') do
+          before_save do |record|
+             probe = record.name
           end
-        end.to raise_error(RuntimeError, /before_save_called/)
+        end
+
+        with_ooor_session({username: 'admin', password: 'admin'}, 'noshare2') do |session|
+          p = session['product.product'].create name: 'nested callback test', packaging_attributes: {'1' => {name: 'pack'}, '2' => {name: 'pack'}}
+          probe.should == 'pack'
+        end
       end
+
     end
 
     describe "ARel emulation" do
@@ -472,7 +494,7 @@ describe Ooor do
       end
 
       it "should be possible to call resource actions and workflow actions" do
-        s = SaleOrder.find(1).copy()
+        s = SaleOrder.find(:first).copy()
         s.wkf_action('order_confirm')
         s.wkf_action('manual_invoice')
         i = s.invoice_ids[0]
@@ -504,21 +526,30 @@ describe Ooor do
 
   describe "Object context abilities" do
     before(:all) do
-      @ooor = Ooor.new(:url => @url, :database => @database)
+      @ooor = Ooor.new(:url => @url, :database => @database, :username => @username, :password => @password)
     end
 
     it "should support context when instanciating collections" do
       @ooor.const_get('product.product')
-      products = ProductProduct.find([1, 2, 3], :context => {:lang => 'en_US'})
-      p = products[0]
-      p.object_session[:lang].should == 'en_US'
-      p.save
+      Ooor.default_session.with_context(lang: 'fr_FR') do
+        products = ProductProduct.find([1, 2, 3])
+        p = products[0]
+        p.save #TODO check that actions keep executing with proper context
+      end
     end
   end
 
   describe "Web SEO utilities" do
     include Ooor
 
+    it "should support ActiveModel::Naming" do
+      with_ooor_session(:url => @url, :database => @database, :username => @username, :password => @password) do |session|
+        session['product.product'].name.should == "ProductProduct"
+        session['product.product'].model_name.route_key.should == "product-product"
+        session['product.product'].model_name.param_key.should == "product_product" #TODO add more expectations
+      end
+    end
+
     it "should support model aliases" do
       Ooor.session_handler.reset!() # alias isn't part of the connection spec, we don't want connectio reuse here
       with_ooor_session(:url => @url, :database => @database, :username => @username, :password => @password, :aliases => {en_US: {products: 'product.product'}}, :param_keys => {'product.product' => 'name'}) do |session|
@@ -557,16 +588,28 @@ describe Ooor do
 
     it "should test correct class name matching with class name" do
       object = Ooor::Reflection::AssociationReflection.new(:test, 'product_product', {class_name: 'product.product'}, nil)
-      object.connection = @ooor
+      object.session = @ooor
       object.klass.should == ProductProduct
     end
 
-    it "should reflect on association (used in simple_form, cocoon...)" do
+    it "should reflect on m2o association (used in simple_form, cocoon...)" do
       reflection = ProductProduct.reflect_on_association(:categ_id)
       reflection.should be_kind_of(Ooor::Reflection::AssociationReflection)
       reflection.klass.should == ProductCategory
     end
 
+    it "should reflect on o2m association (used in simple_form, cocoon...)" do
+      reflection = ProductProduct.reflect_on_association(:packaging)
+      reflection.should be_kind_of(Ooor::Reflection::AssociationReflection)
+      reflection.klass.openerp_model == 'product.packaging'
+    end
+
+    it "should reflect on m2m association (used in simple_form, cocoon...)" do
+      reflection = ResPartner.reflect_on_association(:category_id)
+      reflection.should be_kind_of(Ooor::Reflection::AssociationReflection)
+      reflection.klass.should == ResPartnerCategory
+    end
+
     it "should support column_for_attribute (used by simple_form)" do
       @ooor.const_get('ir.cron').find(:first).column_for_attribute('name')[:type].should == :string
     end
@@ -616,6 +659,112 @@ describe Ooor do
         user_obj.search().should be_kind_of(Array)
       end
     end
+
+    it "should raise AccessDenied/UnAuthorizedError errors" do
+      expect do
+        with_ooor_session(:url => @url, :username => 'demo', :password => 'demo', :database => @database) do |session|
+          session['ir.ui.menu'].first.save
+        end
+      end.to raise_error(Ooor::UnAuthorizedError)
+    end
+
+    it "should assign a secure web session_id to a new web session" do
+      session = Ooor.session_handler.retrieve_session({}, nil, {})
+      session.id.should be_kind_of String
+      session.id.size.should == 32
+    end
+
+    it "should keep existing web session_id" do
+      session = Ooor.session_handler.retrieve_session({}, "12345678912345", {})
+      session.id.should == "12345678912345"
+    end
+
+    it "should reuse the same session and proxies with session with same spec" do
+      obj1 = 1
+      obj2 = 2
+      s1 = 1
+      s2 = 2
+      with_ooor_session(:url => @url, :username => 'demo', :password => 'demo', :database => @database) do |session1|
+        s1 = session1
+        obj1 = session1['ir.ui.menu']
+      end
+      with_ooor_session(:url => @url, :username => 'demo', :password => 'demo', :database => @database) do |session2|
+        s2 = session2
+        obj2 = session2['ir.ui.menu']
+      end
+      s1.object_id.should == s2.object_id
+      obj1.object_id.should == obj2.object_id
+    end
+
+    it "should not reuse the same session and proxies with session with different spec" do
+      obj1 = 1
+      obj2 = 2
+      s1 = 1
+      s2 = 2
+      with_ooor_session(:url => @url, :username => 'admin', :password => 'admin', :database => @database) do |session1|
+        s1 = session1
+        obj1 = session1['ir.ui.menu']
+      end
+
+      with_ooor_session(:url => @url, :username => 'demo', :password => 'demo', :database => @database) do |session2|
+        s2 = session2
+        obj2 = session2['ir.ui.menu']
+      end
+
+      s1.object_id.should_not == s2.object_id
+      obj1.object_id.should_not == obj2.object_id
+    end
+
+    it "when using different web sessions, it should still share model schemas" do
+      obj1 = 1
+      obj2 = 2
+      s1 = 1
+      s2 = 2
+      with_ooor_session({:url => @url, :username => 'admin', :password => 'admin', :database => @database}, 111) do |session1|
+        s1 = session1
+        obj1 = Ooor.model_registry.get_template(session1.config, 'ir.ui.menu')
+      end
+
+      with_ooor_session({:url => @url, :username => 'admin', :password => 'admin', :database => @database}, 123) do |session2|
+        s2 = session2
+        obj2 = Ooor.model_registry.get_template(session2.config, 'ir.ui.menu')
+      end
+
+      s1.object_id.should_not == s2.object_id
+      obj1.should == obj2 unless ActiveModel::VERSION::STRING.start_with? "3.2" #for some reason this doesn't work with Rails 3.2
+    end
+
+
+    it "should use the same session when its session_id is specified and session spec matches (web)" do
+      s1 = 1
+      s2 = 2
+
+      with_ooor_session({:url => @url, :username => 'admin', :password => 'admin', :database => @database}, 123) do |session1|
+        s1 = session1
+      end
+
+      with_ooor_session({:url => @url, :username => 'admin', :password => 'admin', :database => @database}, 123) do |session1|
+        s2 = session1
+      end
+
+      s1.object_id.should == s2.object_id
+    end
+
+    it "should not use the same session when session spec matches but session_id is different (web)" do
+      s1 = 1
+      s2 = 2
+    
+      with_ooor_session({:url => @url, :username => 'admin', :password => 'admin', :database => @database}, 111) do |session1|
+        s1 = session1
+      end
+
+      with_ooor_session({:url => @url, :username => 'admin', :password => 'admin', :database => @database}, 123) do |session1|
+        s2 = session1
+      end
+    
+      s1.object_id.should_not == s2.object_id
+    end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooor
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Raphael Valyi - www.akretion.com
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -53,17 +53,19 @@ files:
 - bin/ooor
 - lib/ooor.rb
 - lib/ooor/associations.rb
+- lib/ooor/autosave_association.rb
 - lib/ooor/base.rb
 - lib/ooor/base64.rb
 - lib/ooor/callbacks.rb
-- lib/ooor/connection.rb
 - lib/ooor/errors.rb
 - lib/ooor/field_methods.rb
 - lib/ooor/helpers/core_helpers.rb
 - lib/ooor/locale.rb
 - lib/ooor/mini_active_resource.rb
 - lib/ooor/model_registry.rb
+- lib/ooor/model_schema.rb
 - lib/ooor/naming.rb
+- lib/ooor/nested_attributes.rb
 - lib/ooor/persistence.rb
 - lib/ooor/rack.rb
 - lib/ooor/railtie.rb
@@ -82,9 +84,7 @@ files:
 - lib/ooor/type_casting.rb
 - lib/ooor/version.rb
 - spec/helpers/test_helper.rb
-- spec/install_nightly.sh
 - spec/ooor_spec.rb
-- spec/requirements.txt
 homepage: http://github.com/akretion/ooor
 licenses: []
 metadata: {}
@@ -109,7 +109,5 @@ signing_key:
 specification_version: 4
 summary: OOOR - OpenObject On Ruby
 test_files:
-- spec/requirements.txt
-- spec/helpers/test_helper.rb
-- spec/install_nightly.sh
 - spec/ooor_spec.rb
+- spec/helpers/test_helper.rb

data/lib/ooor/connection.rb

@@ -1,37 +0,0 @@
-#    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 'active_support/core_ext/hash/indifferent_access'
-
-module Ooor
-  class Connection
-    attr_accessor :config, :connection_session
-
-    def initialize(config, env=false)
-      @config = _config(config)
-      Object.const_set(@config[:scope_prefix], Module.new) if @config[:scope_prefix]
-    end
-
-    def connection_session
-      @connection_session ||= {}.merge!(@config[:connection_session] || {})
-    end
-
-    def helper_paths
-      [File.dirname(__FILE__) + '/helpers/*', *@config[:helper_paths]]
-    end
-
-    def class_name_from_model_key(model_key)
-      model_key.split('.').collect {|name_part| name_part.capitalize}.join
-    end
-
-    private
-
-    def _config(config)
-      c = config.is_a?(String) ? Ooor.load_config(config, env) : config
-      HashWithIndifferentAccess.new(c)
-    end
-
-  end
-end