ooor 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d891fa43f53c6874d616400d37c2805cea7ddc1a
-  data.tar.gz: 1d8d0f527525a111762c53328307bc5a340dabe4
+  metadata.gz: 22e71fb9d4c4cea9db686436090802d441be0b84
+  data.tar.gz: 60dd0f5380c63fdec5184d8befe4538bb294855b
 SHA512:
-  metadata.gz: bf0f99297dfdc754b059be24b48c2292e7520b43c789c97ec4cf4415826e3a56de0c06ef54777c03c1b8eb8422a060bb3134f96fc2bee781ddd1caf9995b78d3
-  data.tar.gz: cc6e0c73cf713dc4ea8d01c6abfaf1c07168d6ec022ffe851443c079c183b1f72a1653e70ebc5197adaa52a3ea04b8dc33811d709abd176ace16abe5b10224f4
+  metadata.gz: ee6dc17416c26483fdb596efd393127826d282be9ea9587c479bb57c8604a2f4ed394692991fc0265e128c0cd9e83638f599c4c4848fc0d83bae63d965df067b
+  data.tar.gz: 8a316e8d2c3f78c84d470561cd6861596eebd9a8c0b8fe22dd9c01103367aa330fa9a8e314262695e2a4f89aa266cc2f96af683278d516d62bb2492b96133b46

data/README.md

@@ -18,7 +18,7 @@ Related projects - a full web stack!
 ------------------------------------
 
 * [Ooorest](http://github.com/akretion/ooorest), Ooor is the **Model** layer of **MVC**. Ooorest is the **Controller** layer, enforcing a clean Railish **REST API** and offering handy **helper** to use OpenERP in your Rails application.
-* [Aktooor](http://github.com/akretion/aktooor), Aktoor is the missing **View** layer of **MVC**. It's based on [SimpleForm](https://github.com/plataformatec/simple_form), that is a clean minimalist framework that extend Rails form framework over [Twitter Bootstrap](http://getbootstrap.com)
+* [Aktooor](http://github.com/akretion/aktooor), Aktooor is the missing **View** layer of **MVC**. It's based on [SimpleForm](https://github.com/plataformatec/simple_form), that is a clean minimalist framework that extend Rails form framework over [Twitter Bootstrap](http://getbootstrap.com)
 * [Erpify](http://github.com/akretion/erpify), Erpify is OpenERP inside the Liquid non evaling language, that is the templating language of Shopify or LocomotiveCMS for instance.
 * [Locomotive-erpify](http://github.com/akretion/locomtive-erpify), Erpify for LocomotiveCMS, both the engine and the Wagon local editor
 * [Solarize](http://github.com/akretion/solarize), pulling data from OpenERP relational database may not scale to your need. No problem with Solarize: you can index your OpenERP data with the [Solerp](http://github.com/akretion/solerp) OpenERP module, then search it using SolR API and even load it from SolR without even hitting OpenERP!

data/lib/ooor/field_methods.rb

@@ -29,7 +29,7 @@ module Ooor
           fields[k]["type"] != "binary" && (options[:include_functions] || !fields[k]["function"])
         end
       end
-      
+
       private
 
       def generate_accessors #TODO we should cache this is a module cached like the template, or eventually generate source code or both
@@ -126,7 +126,7 @@ module Ooor
     end
 
     def get_attribute(meth, *args)
-      lazy_load(meth, *args) if @lazy && @attributes["id"]
+      lazy_load(meth, *args) if @lazy && @attributes["id"] && !@attributes.has_key?(meth)
       if @attributes.has_key?(meth)
         @attributes[meth]
       elsif @attributes["id"] # if field is computed for instance

data/lib/ooor/locale.rb

@@ -1,10 +1,8 @@
 module Ooor
   module Locale
-    # OpenERP requirs a locale+zone mapping while Rails uses locale only, so mapping is likely to be required
+    # Odoo requires a locale+zone mapping while Rails uses locale only, so mapping is likely to be required
     def self.to_erp_locale(locale)
-      if Ooor.default_config[:locale_mapping]
-        mapping = Ooor.default_config[:locale_mapping]
-      else
+      unless mapping = Ooor.default_config[:locale_mapping]
         mapping = {'fr' => 'fr_FR', 'en' => 'en_US'}
       end
       (mapping[locale.to_s] || locale.to_s).gsub('-', '_')

data/lib/ooor/naming.rb

@@ -11,7 +11,7 @@ module Ooor
         @plural = klass.openerp_model # OpenERP doesn't enforce plural / singular conventions sadly...
         @element = klass.openerp_model
         @human = klass.description || klass.openerp_model
-        @param_key = klass.openerp_model.gsub('.', '_') 
+        @param_key = klass.openerp_model.gsub('.', '_')
         @i18n_key = klass.openerp_model
         @route_key = klass.openerp_model.gsub('.', '-')
         @singular_route_key = klass.openerp_model.gsub('.', '-')
@@ -58,8 +58,14 @@ module Ooor
 
       def find_by_permalink(param, options={})
         # NOTE in v8, see if we can use PageConverter here https://github.com/akretion/openerp-addons/blob/trunk-website-al/website/models/ir_http.py#L138
-        param = param.to_i unless param.to_i == 0
-        options.merge!(domain: {param_field => param})
+        param.gsub!('-', ' ')
+        if param.split(' ').last.to_i != 0
+          options.merge!(domain: {:id => param.split(' ').last.to_i})
+        elsif param.to_i == 0
+          options.merge!(domain: [param_field, 'ilike', param])
+        else
+          options.merge!(domain: {:id => param.to_i})
+        end
         find(:first, options)
       end
 

data/lib/ooor/rack.rb

@@ -1,16 +1,17 @@
 require 'active_support/concern'
 
 module Ooor
-  class Rack
 
     DEFAULT_OOOR_SESSION_CONFIG_MAPPER = Proc.new do |env|
       Ooor.logger.debug "\n\nWARNING: using DEFAULT_OOOR_SESSION_CONFIG_MAPPER, you should probably define your own instead!
       You can define an Ooor::Rack.ooor_session_config_mapper block that will be evaled
       in the context of the rack middleware call after user is authenticated using Warden.
       Use it to map a Warden authentication to the OpenERP authentication you want.\n"""
-      Ooor.default_config
+      {}
     end
 
+    DEFAULT_OOOR_PUBLIC_SESSION_CONFIG_MAPPER = DEFAULT_OOOR_SESSION_CONFIG_MAPPER
+
     module RackBehaviour
       extend ActiveSupport::Concern
       module ClassMethods
@@ -18,10 +19,16 @@ module Ooor
           @ooor_session_config_mapper = block if block
           @ooor_session_config_mapper || DEFAULT_OOOR_SESSION_CONFIG_MAPPER
         end
+
+        def ooor_public_session_config_mapper(&block)
+          @ooor_public_session_config_mapper = block if block
+          @ooor_public_session_config_mapper || DEFAULT_OOOR_PUBLIC_SESSION_CONFIG_MAPPER
+        end
       end
 
       def set_ooor!(env)
         ooor_session = self.get_ooor_session(env)
+        ooor_public_session = self.get_ooor_public_session(env)
         if defined?(I18n) && I18n.locale
           lang = Ooor::Locale.to_erp_locale(I18n.locale)
         elsif http_lang = env["HTTP_ACCEPT_LANGUAGE"]
@@ -30,16 +37,29 @@ module Ooor
           lang = ooor_session.config['lang'] || 'en_US'
         end
         context = {'lang' => lang} #TODO also deal with timezone
-        env['ooor'] = {'context' => context, 'ooor_session'=> ooor_session}
+        env['ooor'] = {'context' => context, 'ooor_session'=> ooor_session, 'ooor_public_session' => ooor_public_session}
+      end
+
+      def session_key
+        if defined?(Rails)
+          Rails.application.config.session_options[:key]
+        else
+          'rack.session'
+        end
+      end
+
+      def get_ooor_public_session(env)
+        config = Ooor::Rack.ooor_public_session_config_mapper.call(env)
+        Ooor.session_handler.retrieve_session(config)
       end
 
       def get_ooor_session(env)
         cookies_hash = env['rack.request.cookie_hash'] || ::Rack::Request.new(env).cookies
-        session = Ooor.session_handler.sessions[cookies_hash['ooor_session_id']]
+        session = Ooor.session_handler.sessions[cookies_hash[self.session_key()]]
         session ||= Ooor.session_handler.sessions[cookies_hash['session_id']]
         unless session # session could have been used by an other worker, try getting it
-          config = Ooor::Rack.ooor_session_config_mapper.call(env)
-          spec = config[:session_sharing] ? cookies_hash['session_id'] : cookies_hash['ooor_session_id']
+          config = Ooor.default_config.merge(Ooor::Rack.ooor_session_config_mapper.call(env))
+          spec = config[:session_sharing] ? cookies_hash['session_id'] : cookies_hash[self.session_key()]
           web_session = Ooor.session_handler.get_web_session(spec) if spec # created by some other worker?
           unless web_session
             if config[:session_sharing]
@@ -51,10 +71,11 @@ module Ooor
             end
           end
           session = Ooor.session_handler.retrieve_session(config, spec, web_session)
-        end       
+          session.config[:params] = {email: env['warden'].try(:user).try(:email)}
+        end
         session
       end
-        
+
       def set_ooor_session!(env, status, headers, body)
         case headers["Set-Cookie"]
         when nil, ''
@@ -62,19 +83,15 @@ module Ooor
         when Array
           headers["Set-Cookie"] = headers["Set-Cookie"].join("\n")
         end
-        
+
         ooor_session = env['ooor']['ooor_session']
         if ooor_session.config[:session_sharing]
           share_openerp_session!(headers, ooor_session)
-        else # NOTE: we don't put that in a Rails session because we want to remain server agnostic
-          headers["Set-Cookie"] = [headers["Set-Cookie"],
-            "ooor_session_id=#{ooor_session.id}; Path=/",
-          ].join("\n")
         end
         response = ::Rack::Response.new body, status, headers
         response.finish
       end
-        
+
       def share_openerp_session!(headers, ooor_session)
         if ooor_session.config[:username] == 'admin'
           if ooor_session.config[:force_session_sharing]
@@ -98,17 +115,18 @@ module Ooor
 
     end
 
-    include RackBehaviour
+    class Rack
+      include RackBehaviour
 
-    def initialize(app=nil)
-      @app=app
-    end
+      def initialize(app=nil)
+        @app=app
+      end
 
-    def call(env)
-      set_ooor!(env)
-      status, headers, body = @app.call(env)
-      set_ooor_session!(env, status, headers, body)
+      def call(env)
+        set_ooor!(env)
+        status, headers, body = @app.call(env)
+        set_ooor_session!(env, status, headers, body)
+      end
     end
 
-  end
 end

data/lib/ooor/services.rb

@@ -29,7 +29,7 @@ module Ooor
   class CommonService < Service
     define_service(:common, %w[ir_get ir_set ir_del about ooor_alias_login logout timezone_get get_available_updates get_migration_scripts get_server_environment login_message check_connectivity about get_stats list_http_services version authenticate get_available_updates set_loglevel get_os_time get_sqlcount])
 
-    def login(db, username, password)
+    def login(db, username, password, kw={})
       @session.logger.debug "OOOR login - db: #{db}, username: #{username}"
 
       if @session.config[:force_xml_rpc]
@@ -39,7 +39,7 @@ module Ooor
         response = conn.post do |req|
           req.url '/web/session/authenticate'
           req.headers['Content-Type'] = 'application/json'
-          req.body = {method: 'call', params: { db: db, login: username, password: password}}.to_json
+          req.body = {method: 'call', params: {db: db, login: username, password: password, base_location: kw}}.to_json
         end
         @session.web_session[:cookie] = response.headers["set-cookie"]
         json_response = JSON.parse(response.body)
@@ -52,8 +52,10 @@ module Ooor
           end
 
           @session.web_session[:session_id] = json_response['result']['session_id']
-          user_id = json_response['result']['uid']
+          user_id = json_response['result'].delete('uid')
           @session.config[:user_id] = user_id
+          @session.web_session.merge!(json_response['result'].delete('user_context'))
+          @session.config.merge!(json_response['result'])
           Ooor.session_handler.register_session(@session)
           user_id
         else
@@ -96,7 +98,7 @@ module Ooor
 
     def object_service(service, obj, method, *args)
       unless @session.config[:user_id]
-        @session.common.login(@session.config[:database], @session.config[:username], @session.config[:password])
+        @session.common.login(@session.config[:database], @session.config[:username], @session.config[:password], @session.config[:params])
       end
       args = inject_session_context(service, method, *args)
       uid = @session.config[:user_id]

data/lib/ooor/version.rb

@@ -1,6 +1,6 @@
 module Ooor
   MAJOR = 2
-  MINOR = 2
+  MINOR = 4
   TINY  = 0
   PRE   = nil
 

metadata

@@ -1,46 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: ooor
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Raphael Valyi - www.akretion.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
+  name: activemodel
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: faraday
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: OOOR exposes OpenERP business object proxies to your Ruby (Rails or not)
-  application. It extends the standard ActiveResource API. Running on JRuby, OOOR
-  also offers a convenient bridge between OpenERP and the Java eco-system
+description: OOOR exposes OpenERP business object proxies to your Ruby (Rails or not) application. It extends the standard ActiveResource API. Running on JRuby, OOOR also offers a convenient bridge between OpenERP and the Java eco-system
 email: raphael.valyi@akretion.com
 executables:
 - ooor
@@ -88,7 +86,7 @@ files:
 homepage: http://github.com/akretion/ooor
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,11 +101,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.4
+signing_key:
 specification_version: 4
 summary: OOOR - OpenObject On Ruby
 test_files:
-- spec/helpers/test_helper.rb
 - spec/ooor_spec.rb
+- spec/helpers/test_helper.rb